@cntrl-site/sdk-nextjs 1.9.95 → 1.9.96

package/lib/components/Head.js

@@ -8,14 +8,14 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const html_react_parser_1 = __importDefault(require("html-react-parser"));
 const head_1 = __importDefault(require("next/head"));
 const sdk_1 = require("@cntrl-site/sdk");
-const CNTRLHead = ({ meta, project, slug, siteUrl, fontsVault }) => {
+const CNTRLHead = ({ meta, project, slug, siteUrl }) => {
     const canonicalUrl = buildCanonicalUrl(siteUrl !== null && siteUrl !== void 0 ? siteUrl : project.primaryDomain, slug);
     const googleFonts = (0, html_react_parser_1.default)(project.fonts.google);
     const adobeFonts = (0, html_react_parser_1.default)(project.fonts.adobe);
     const parsedFonts = Object.assign(Object.assign({}, (typeof googleFonts === 'object' ? googleFonts : {})), (typeof adobeFonts === 'object' ? adobeFonts : {}));
     const customFonts = project.fonts.custom;
     const htmlHead = (0, html_react_parser_1.default)(project.html.head);
-    const ffGenerator = new sdk_1.FontFaceGenerator([...customFonts, ...fontsVault]);
+    const ffGenerator = new sdk_1.FontFaceGenerator(customFonts);
     const links = Object.values(parsedFonts).map((value) => {
         var _a, _b;
         if (!value)

package/lib/components/Page.js

@@ -13,13 +13,13 @@ const Head_1 = require("./Head");
 const Keyframes_1 = require("../provider/Keyframes");
 const ItemGeometryContext_1 = require("../ItemGeometry/ItemGeometryContext");
 const ItemGeometryService_1 = require("../ItemGeometry/ItemGeometryService");
-const Page = ({ article, project, meta, keyframes, sectionData, siteUrl, fontsVault }) => {
+const Page = ({ article, project, meta, keyframes, sectionData, siteUrl }) => {
     var _a;
     const afterBodyOpen = (0, html_react_parser_1.default)(project.html.afterBodyOpen);
     const beforeBodyClose = (0, html_react_parser_1.default)(project.html.beforeBodyClose);
     const keyframesRepo = (0, react_1.useMemo)(() => new Keyframes_1.Keyframes(keyframes), [keyframes]);
     const itemGeometryService = (0, react_1.useMemo)(() => new ItemGeometryService_1.ItemGeometryService(), []);
     const currentSlug = (_a = project.pages.find(p => p.articleId === article.id)) === null || _a === void 0 ? void 0 : _a.slug;
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Head_1.CNTRLHead, { project: project, meta: meta, slug: currentSlug, siteUrl: siteUrl, fontsVault: fontsVault }), afterBodyOpen, (0, jsx_runtime_1.jsx)(ItemGeometryContext_1.ItemGeometryContext.Provider, { value: itemGeometryService, children: (0, jsx_runtime_1.jsx)(KeyframesContext_1.KeyframesContext.Provider, { value: keyframesRepo, children: (0, jsx_runtime_1.jsx)(Article_1.Article, { article: article, sectionData: sectionData }) }) }), beforeBodyClose] }));
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Head_1.CNTRLHead, { project: project, meta: meta, slug: currentSlug, siteUrl: siteUrl }), afterBodyOpen, (0, jsx_runtime_1.jsx)(ItemGeometryContext_1.ItemGeometryContext.Provider, { value: itemGeometryService, children: (0, jsx_runtime_1.jsx)(KeyframesContext_1.KeyframesContext.Provider, { value: keyframesRepo, children: (0, jsx_runtime_1.jsx)(Article_1.Article, { article: article, sectionData: sectionData }) }) }), beforeBodyClose] }));
 };
 exports.Page = Page;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cntrl-site/sdk-nextjs",
-  "version": "1.9.95",
+  "version": "1.9.96",
   "description": "SDK for Next.js",
   "author": "arsen@momdesign.nyc",
   "license": "MIT",
@@ -31,9 +31,9 @@
   "dependencies": {
     "@antfu/eslint-config": "^3.8.0",
     "@cntrl-site/color": "^1.0.0",
-    "@cntrl-site/components": "^1.0.40",
+    "@cntrl-site/components": "^1.0.46",
     "@cntrl-site/effects": "^1.4.2",
-    "@cntrl-site/sdk": "1.28.1",
+    "@cntrl-site/sdk": "^1.28.0",
     "@types/vimeo__player": "^2.18.0",
     "@vimeo/player": "^2.25.0",
     "html-react-parser": "^3.0.1",

package/src/components/Head.tsx

@@ -1,17 +1,16 @@
 import React, { FC } from 'react';
 import HTMLReactParser, { domToReact } from 'html-react-parser';
 import Head from 'next/head';
-import { FontFaceGenerator, Meta, Project, FontVault } from '@cntrl-site/sdk';
+import { FontFaceGenerator, Meta, Project } from '@cntrl-site/sdk';
 
 interface Props {
   project: Project;
   meta: Meta;
   slug?: string;
   siteUrl?: string;
-  fontsVault: FontVault[];
 }
 
-export const CNTRLHead: FC<Props> = ({ meta, project, slug, siteUrl, fontsVault }) => {
+export const CNTRLHead: FC<Props> = ({ meta, project, slug, siteUrl }) => {
   const canonicalUrl = buildCanonicalUrl(siteUrl ?? project.primaryDomain, slug);
   const googleFonts: ReturnType<typeof domToReact> = HTMLReactParser(project.fonts.google);
   const adobeFonts: ReturnType<typeof domToReact> = HTMLReactParser(project.fonts.adobe);
@@ -21,7 +20,7 @@ export const CNTRLHead: FC<Props> = ({ meta, project, slug, siteUrl, fontsVault
   };
   const customFonts = project.fonts.custom;
   const htmlHead = HTMLReactParser(project.html.head);
-  const ffGenerator = new FontFaceGenerator([...customFonts, ...fontsVault]);
+  const ffGenerator = new FontFaceGenerator(customFonts);
   const links = Object.values(parsedFonts as ReturnType<typeof domToReact>).map((value) => {
     if (!value) return null;
     const rel = value?.rel || value.props?.rel;

package/src/components/Page.tsx

@@ -1,6 +1,6 @@
 import React, { FC, useMemo } from 'react';
 import HTMLReactParser from 'html-react-parser';
-import { Article as TArticle, Project, Meta, KeyframeAny, FontVault } from '@cntrl-site/sdk';
+import { Article as TArticle, Project, Meta, KeyframeAny } from '@cntrl-site/sdk';
 import { Article } from './Article';
 import { KeyframesContext } from '../provider/KeyframesContext';
 import { CNTRLHead } from './Head';
@@ -17,7 +17,6 @@ export interface PageProps {
   article: TArticle;
   project: Project;
   meta: Meta;
-  fontsVault: FontVault[];
   keyframes: KeyframeAny[];
   sectionData: Record<SectionName, any>;
   publicApiBase?: string;
@@ -25,7 +24,7 @@ export interface PageProps {
   siteUrl?: string;
 }
 
-export const Page: FC<PageProps> = ({ article, project, meta, keyframes, sectionData, siteUrl, fontsVault }) => {
+export const Page: FC<PageProps> = ({ article, project, meta, keyframes, sectionData, siteUrl }) => {
   const afterBodyOpen = HTMLReactParser(project.html.afterBodyOpen);
   const beforeBodyClose = HTMLReactParser(project.html.beforeBodyClose);
   const keyframesRepo = useMemo(() => new Keyframes(keyframes), [keyframes]);
@@ -33,7 +32,7 @@ export const Page: FC<PageProps> = ({ article, project, meta, keyframes, section
   const currentSlug = project.pages.find(p => p.articleId === article.id)?.slug;
   return (
     <>
-      <CNTRLHead project={project} meta={meta} slug={currentSlug} siteUrl={siteUrl} fontsVault={fontsVault} />
+      <CNTRLHead project={project} meta={meta} slug={currentSlug} siteUrl={siteUrl} />
       {afterBodyOpen}
       <ItemGeometryContext.Provider value={itemGeometryService}>
         <KeyframesContext.Provider value={keyframesRepo}>