@prezly/theme-kit-nextjs 1.2.1 → 1.3.3

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

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useLanguages = void 0;
 var useNewsroomContext_1 = require("./useNewsroomContext");
-var useLanguages = function () {
+function useLanguages() {
     var context = (0, useNewsroomContext_1.useNewsroomContext)();
     return context.languages;
-};
+}
 exports.useLanguages = useLanguages;
 //# sourceMappingURL=useLanguages.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useLanguages.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/useLanguages.ts"],"names":[],"mappings":";;;AAAA,2DAA0D;AAEnD,IAAM,YAAY,GAAG;IACxB,IAAM,OAAO,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAErC,OAAO,OAAO,CAAC,SAAS,CAAC;AAC7B,CAAC,CAAC;AAJW,QAAA,YAAY,gBAIvB"}
+{"version":3,"file":"useLanguages.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/useLanguages.ts"],"names":[],"mappings":";;;AAAA,2DAA0D;AAE1D,SAAgB,YAAY;IACxB,IAAM,OAAO,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAErC,OAAO,OAAO,CAAC,SAAS,CAAC;AAC7B,CAAC;AAJD,oCAIC"}

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

@@ -1 +1 @@
-export declare const useNewsroom: () => import("@prezly/sdk").Newsroom;
+export declare function useNewsroom(): import("@prezly/sdk").Newsroom;

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

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useNewsroom = void 0;
 var useNewsroomContext_1 = require("./useNewsroomContext");
-var useNewsroom = function () {
+function useNewsroom() {
     var context = (0, useNewsroomContext_1.useNewsroomContext)();
     return context.newsroom;
-};
+}
 exports.useNewsroom = useNewsroom;
 //# sourceMappingURL=useNewsroom.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useNewsroom.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/useNewsroom.ts"],"names":[],"mappings":";;;AAAA,2DAA0D;AAEnD,IAAM,WAAW,GAAG;IACvB,IAAM,OAAO,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAErC,OAAO,OAAO,CAAC,QAAQ,CAAC;AAC5B,CAAC,CAAC;AAJW,QAAA,WAAW,eAItB"}
+{"version":3,"file":"useNewsroom.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/useNewsroom.ts"],"names":[],"mappings":";;;AAAA,2DAA0D;AAE1D,SAAgB,WAAW;IACvB,IAAM,OAAO,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAErC,OAAO,OAAO,CAAC,QAAQ,CAAC;AAC5B,CAAC;AAJD,kCAIC"}

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

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

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useNewsroomContext = void 0;
 var react_1 = require("react");
 var context_1 = require("../context");
-var useNewsroomContext = function () {
+function 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
     var newsroomContext = (0, react_1.useContext)(context_1.NewsroomContext);
@@ -11,6 +11,6 @@ var useNewsroomContext = function () {
         throw new Error('No `NewsroomContextProvider` found when calling `useNewsroomContext`');
     }
     return newsroomContext;
-};
+}
 exports.useNewsroomContext = useNewsroomContext;
 //# sourceMappingURL=useNewsroomContext.js.map

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,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"}
+{"version":3,"file":"useNewsroomContext.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/useNewsroomContext.ts"],"names":[],"mappings":";;;AAAA,+BAAmC;AAGnC,sCAA6C;AAE7C,SAAgB,kBAAkB;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;AATD,gDASC"}

package/build/types.d.ts

@@ -1,5 +1,5 @@
 import type { CultureRef, ExtraStoryFields, Story } from '@prezly/sdk';
-import { NewsroomContextProps } from './newsroom-context';
+import type { NewsroomContextProps } from './newsroom-context';
 export interface ServerSidePageProps {
     localeResolved: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prezly/theme-kit-nextjs",
-  "version": "1.2.1",
+  "version": "1.3.3",
   "description": "Data layer and utility library for developing Prezly themes with NextJS",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -52,20 +52,12 @@
     "parse-data-url": "^4.0.1"
   },
   "devDependencies": {
+    "@prezly/eslint-config": "^4.0.0",
     "@types/node": "^17.0.13",
     "@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",

package/src/adapter-nextjs/getNewsroomServerSideProps.ts

@@ -1,9 +1,11 @@
+import type { Story } from '@prezly/sdk';
 import type { GetServerSidePropsContext } from 'next';
 
 import { getPrezlyApi } from '../data-fetching';
 
 interface Options {
     loadHomepageContacts?: boolean;
+    story?: Story;
 }
 
 export async function getNewsroomServerSideProps(
@@ -13,7 +15,7 @@ export async function getNewsroomServerSideProps(
     const { req: request, locale } = context;
 
     const api = getPrezlyApi(request);
-    const serverSideProps = await api.getNewsroomServerSideProps(request, locale);
+    const serverSideProps = await api.getNewsroomServerSideProps(request, locale, options.story);
 
     if (options.loadHomepageContacts) {
         serverSideProps.newsroomContextProps.contacts = await api.getNewsroomContacts();

package/src/adapter-nextjs/processRequest.ts

@@ -2,7 +2,7 @@ import type { GetServerSidePropsContext, GetServerSidePropsResult } from 'next';
 
 import { getShortestLocaleCode } from '../data-fetching';
 import { getRedirectToCanonicalLocale, LocaleObject } from '../intl';
-import { PageProps, ServerSidePageProps } from '../types';
+import type { PageProps, ServerSidePageProps } from '../types';
 
 export function processRequest<Props>(
     context: GetServerSidePropsContext,

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

@@ -1,14 +1,15 @@
-import PrezlySDK, {
+import type {
     Category,
     ExtraStoryFields,
     Newsroom,
     NewsroomLanguageSettings,
     Story,
 } from '@prezly/sdk';
+import PrezlySDK from '@prezly/sdk';
 import type { IncomingMessage } from 'http';
 
 import { LocaleObject } from '../../intl';
-import { PageProps, ServerSidePageProps } from '../../types';
+import type { PageProps, ServerSidePageProps } from '../../types';
 import { DEFAULT_PAGE_SIZE } from '../constants';
 import { getAlgoliaSettings } from '../lib/getAlgoliaSettings';
 

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

@@ -4,8 +4,8 @@ import { getEnvVariables } from '../lib/getEnvVariables';
 
 import { PrezlyApi } from './PrezlyApi';
 
-export const getPrezlyApi = (req?: IncomingMessage): PrezlyApi => {
-    if (process.browser) {
+export function getPrezlyApi(req?: IncomingMessage): PrezlyApi {
+    if (typeof window !== 'undefined') {
         throw new Error('"getPrezlyApi" should only be used on back-end side.');
     }
 
@@ -21,4 +21,4 @@ export const getPrezlyApi = (req?: IncomingMessage): PrezlyApi => {
     }
 
     return new PrezlyApi(PREZLY_ACCESS_TOKEN, PREZLY_NEWSROOM_UUID);
-};
+}

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

@@ -8,15 +8,17 @@ const publishedAndPublic = [
     { visibility: { $in: ['public'] } },
 ];
 
-export const getSlugQuery = (newsroomUuid: string, slug: string) => ({
-    $and: [
-        { 'newsroom.uuid': { $in: [newsroomUuid] } },
-        { slug: { $eq: slug } },
-        ...publishedAndAccessible,
-    ],
-});
-
-export const getStoriesQuery = (newsroomUuid: string, categoryId?: number, localeCode?: string) => {
+export function getSlugQuery(newsroomUuid: string, slug: string) {
+    return {
+        $and: [
+            { 'newsroom.uuid': { $in: [newsroomUuid] } },
+            { slug: { $eq: slug } },
+            ...publishedAndAccessible,
+        ],
+    };
+}
+
+export function getStoriesQuery(newsroomUuid: string, categoryId?: number, localeCode?: string) {
     const query: any = {
         $and: [...publishedAndPublic, { 'newsroom.uuid': { $in: [newsroomUuid] } }],
     };
@@ -30,15 +32,20 @@ export const getStoriesQuery = (newsroomUuid: string, categoryId?: number, local
     }
 
     return query;
-};
+}
 
-export const getSortByPublishedDate = (order: 'asc' | 'desc') =>
-    order === 'desc' ? '-published_at' : 'published_at';
+export function getSortByPublishedDate(order: 'asc' | 'desc') {
+    return order === 'desc' ? '-published_at' : 'published_at';
+}
 
-export const getGalleriesQuery = () => ({
-    $and: [{ status: { $eq: 'public' } }, { images_number: { $gt: 0 } }],
-});
+export function getGalleriesQuery() {
+    return {
+        $and: [{ status: { $eq: 'public' } }, { images_number: { $gt: 0 } }],
+    };
+}
 
-export const getContactsQuery = () => ({
-    $and: [{ is_featured: { $eq: true } }],
-});
+export function getContactsQuery() {
+    return {
+        $and: [{ is_featured: { $eq: true } }],
+    };
+}

package/src/data-fetching/getLocalizedCategoryData.ts

@@ -1,7 +1,7 @@
 import type { Category } from '@prezly/sdk';
 
-import { LocaleObject } from '../intl';
-import { AlgoliaCategoryRef } from '../types';
+import type { LocaleObject } from '../intl';
+import type { AlgoliaCategoryRef } from '../types';
 
 function isAlgoliaCategory(
     category: Category | AlgoliaCategoryRef,

package/src/data-fetching/getNewsroomLogoUrl.ts

@@ -11,10 +11,9 @@ export function getNewsroomLogoUrl(newsroom: Newsroom): string {
 }
 
 export function getNewsroomFaviconUrl(newsroom: Newsroom, previewSize = 400): string {
-    if (newsroom.icon) {
-        return `${getAssetsUrl(
-            newsroom.icon.uuid,
-        )}-/preview/${previewSize}x${previewSize}/-/quality/best/`;
+    const image = newsroom.icon || newsroom.square_logo;
+    if (image) {
+        return `${getAssetsUrl(image.uuid)}-/preview/${previewSize}x${previewSize}/-/quality/best/`;
     }
 
     return '';

package/src/data-fetching/getPrivacyPortalUrl.ts

@@ -1,8 +1,11 @@
 import type { Newsroom } from '@prezly/sdk';
 
-import { LocaleObject } from '../intl';
+import type { LocaleObject } from '../intl';
 
-type PrivacyPortalUrlOptions = { email?: string; action?: 'subscribe' | 'unsubscribe' };
+type PrivacyPortalUrlOptions = {
+    email?: string;
+    action?: 'data-request' | 'subscribe' | 'unsubscribe';
+};
 
 export function getPrivacyPortalUrl(
     newsroom: Newsroom,

package/src/data-fetching/getStoryPublicationDate.tsx

@@ -1,6 +1,6 @@
 import type { Story } from '@prezly/sdk';
 
-import { AlgoliaStory } from '../types';
+import type { AlgoliaStory } from '../types';
 
 export function getStoryPublicationDate(story: Story | AlgoliaStory): Date | null {
     const { published_at } = story;

package/src/data-fetching/lib/getAlgoliaSettings.ts

@@ -1,11 +1,11 @@
 import type { IncomingMessage } from 'http';
 
-import { AlgoliaSettings } from '../types';
+import type { AlgoliaSettings } from '../types';
 
 import { getEnvVariables } from './getEnvVariables';
 
-export const getAlgoliaSettings = (req?: IncomingMessage): AlgoliaSettings => {
-    if (process.browser) {
+export function getAlgoliaSettings(req?: IncomingMessage): AlgoliaSettings {
+    if (typeof window !== 'undefined') {
         throw new Error('"getAlgoliaSettings" should only be used on back-end side.');
     }
 
@@ -26,4 +26,4 @@ export const getAlgoliaSettings = (req?: IncomingMessage): AlgoliaSettings => {
         ALGOLIA_APP_ID,
         ALGOLIA_INDEX,
     };
-};
+}

package/src/data-fetching/lib/getEnvVariables.ts

@@ -3,7 +3,7 @@ import parseDataUrl from 'parse-data-url';
 
 import type { PrezlyEnv } from '../types';
 
-const decodeJson = (json: string): Record<string, any> => {
+function decodeJson(json: string): Record<string, any> {
     try {
         const decoded = JSON.parse(json);
         if (decoded && typeof decoded === 'object') {
@@ -13,9 +13,9 @@ const decodeJson = (json: string): Record<string, any> => {
         // passthru
     }
     return {};
-};
+}
 
-const decodeHttpEnv = (header: string): Record<string, any> => {
+function decodeHttpEnv(header: string): Record<string, any> {
     if (header.startsWith('data:')) {
         const parsed = parseDataUrl(header);
         if (parsed && parsed.contentType === 'application/json') {
@@ -25,10 +25,10 @@ const decodeHttpEnv = (header: string): Record<string, any> => {
         return {}; // unsupported data-uri
     }
     return decodeJson(header);
-};
+}
 
-export const getEnvVariables = (req?: IncomingMessage): PrezlyEnv => {
-    if (process.browser) {
+export function getEnvVariables(req?: IncomingMessage): PrezlyEnv {
+    if (typeof window !== 'undefined') {
         throw new Error('"getEnvVariables" should only be used on back-end side.');
     }
 
@@ -41,4 +41,4 @@ export const getEnvVariables = (req?: IncomingMessage): PrezlyEnv => {
     }
 
     return { ...process.env };
-};
+}

package/src/intl/lang.ts

@@ -1,4 +1,4 @@
-import { CultureRef, NewsroomLanguageSettings } from '@prezly/sdk';
+import type { CultureRef, NewsroomLanguageSettings } from '@prezly/sdk';
 
 function isOnlyCulture(culture: CultureRef, languages: NewsroomLanguageSettings[]): boolean {
     const numberOfLanguages = languages.filter(

package/src/intl/locale.ts

@@ -1,5 +1,6 @@
 import type { Redirect } from 'next';
-import { ParsedUrlQuery, stringify } from 'querystring';
+import type { ParsedUrlQuery } from 'querystring';
+import { stringify } from 'querystring';
 
 import { LocaleObject } from './localeObject';
 

package/src/intl/localeConfig.js

@@ -33,6 +33,7 @@ const supportedLocales = [
     'en-IE',
     'en-IL',
     'en-IN',
+    'en-JM',
     'en-JP',
     'en-KH',
     'en-KR',

package/src/newsroom-context/context.tsx

@@ -7,7 +7,8 @@ import type {
     NewsroomLanguageSettings,
     NewsroomThemePreset,
 } from '@prezly/sdk';
-import { createContext, FunctionComponent, useMemo } from 'react';
+import type { PropsWithChildren } from 'react';
+import { createContext, useMemo } from 'react';
 
 import type { AlgoliaSettings } from '../data-fetching';
 import { DEFAULT_LOCALE, LocaleObject } from '../intl';
@@ -31,7 +32,7 @@ export interface NewsroomContextProps extends Omit<NewsroomContextType, 'locale'
 
 export const NewsroomContext = createContext<NewsroomContextType | undefined>(undefined);
 
-export const NewsroomContextProvider: FunctionComponent<NewsroomContextProps> = ({
+export function NewsroomContextProvider({
     categories,
     contacts,
     newsroom,
@@ -43,7 +44,7 @@ export const NewsroomContextProvider: FunctionComponent<NewsroomContextProps> =
     themePreset,
     algoliaSettings,
     children,
-}) => {
+}: PropsWithChildren<NewsroomContextProps>) {
     const locale = useMemo(
         () => LocaleObject.fromAnyCode(localeCode || DEFAULT_LOCALE),
         [localeCode],
@@ -67,4 +68,4 @@ export const NewsroomContextProvider: FunctionComponent<NewsroomContextProps> =
             {children}
         </NewsroomContext.Provider>
     );
-};
+}

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

@@ -1,7 +1,7 @@
 import { useNewsroomContext } from './useNewsroomContext';
 
-export const useAlgoliaSettings = () => {
+export function useAlgoliaSettings() {
     const context = useNewsroomContext();
 
     return context.algoliaSettings;
-};
+}

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

@@ -1,7 +1,7 @@
 import { useNewsroomContext } from './useNewsroomContext';
 
-export const useCategories = () => {
+export function useCategories() {
     const context = useNewsroomContext();
 
     return context.categories;
-};
+}

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

@@ -1,7 +1,7 @@
 import { useNewsroomContext } from './useNewsroomContext';
 
-export const useCompanyInformation = () => {
+export function useCompanyInformation() {
     const context = useNewsroomContext();
 
     return context.companyInformation;
-};
+}

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

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

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

@@ -1,7 +1,7 @@
 import { useNewsroomContext } from './useNewsroomContext';
 
-export const useCurrentLocale = () => {
+export function useCurrentLocale() {
     const context = useNewsroomContext();
 
     return context.locale;
-};
+}

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

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

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

@@ -3,7 +3,7 @@ import { useRouter } from 'next/router';
 import { useCallback } from 'react';
 
 import { getCategoryHasTranslation, getCategoryUrl } from '../../data-fetching';
-import { LocaleObject } from '../../intl';
+import type { LocaleObject } from '../../intl';
 
 import { useCurrentCategory } from './useCurrentCategory';
 import { useCurrentStory } from './useCurrentStory';

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

@@ -1,7 +1,7 @@
 import { useNewsroomContext } from './useNewsroomContext';
 
-export const useLanguages = () => {
+export function useLanguages() {
     const context = useNewsroomContext();
 
     return context.languages;
-};
+}

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

@@ -1,7 +1,7 @@
 import { useNewsroomContext } from './useNewsroomContext';
 
-export const useNewsroom = () => {
+export function useNewsroom() {
     const context = useNewsroomContext();
 
     return context.newsroom;
-};
+}

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

@@ -1,8 +1,9 @@
 import { useContext } from 'react';
 
-import { NewsroomContext, NewsroomContextType } from '../context';
+import type { NewsroomContextType } from '../context';
+import { NewsroomContext } from '../context';
 
-export const useNewsroomContext = () => {
+export function 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: NewsroomContextType | undefined = useContext(NewsroomContext);
@@ -11,4 +12,4 @@ export const useNewsroomContext = () => {
     }
 
     return newsroomContext;
-};
+}

package/src/types.ts

@@ -1,7 +1,7 @@
 // TODO: Re-arrange the types to make them isolated to respective libs where possible
 import type { CultureRef, ExtraStoryFields, Story } from '@prezly/sdk';
 
-import { NewsroomContextProps } from './newsroom-context';
+import type { NewsroomContextProps } from './newsroom-context';
 
 export interface ServerSidePageProps {
     localeResolved: boolean;