@redneckz/wildless-cms-uni-blocks 0.5.8 → 0.5.10

package/mobile/src/components/OtherProducts/OtherProductsItem.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { ColorPalette, UniBlockProps } from '../../model/ContentPageDef';
 import type { VNode } from '../../model/VNode';
-import type { ColorPalette, UniBlockProps } from '../../types';
 import { renderBlocksList } from '../../ui-kit/BlocksList/renderBlocksList';
 import { Foldable } from '../../ui-kit/Foldable/Foldable';
 import type { BlockItemCommonProps } from './OtherProductsContent';

package/mobile/src/components/PictureText/PictureText.example.json

@@ -14,12 +14,14 @@
     {
       "label": "Преимущество №1",
       "icon": {
+        "format": "webp",
         "icon": "ShieldTickIcon"
       }
     },
     {
       "label": "Преимущество №2",
       "icon": {
+        "format": "webp",
         "icon": "ShieldTickIcon"
       }
     }

package/mobile/src/components/PictureText/PictureText.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
 import { VersionStyleMap } from '../../model/BlockVersion';
-import type { UniBlockProps } from '../../types';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import { BenefitItem } from '../../ui-kit/BenefitItem/BenefitItem';
 import type { BenefitItemProps } from '../../ui-kit/BenefitItem/BenefitItemProps';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';

package/mobile/src/components/Placeholder/Placeholder.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { PlaceholderContent } from './PlaceholderContent';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { Headline } from '../Headline/Headline';
-import type { UniBlockProps } from '../../types';
 import { getTileHeadingType } from '../BaseTile/getTileHeadingType';
 import { getTileMinHeight } from '../BaseTile/getTileMinHeight';
 import { getTileRightPadding } from '../BaseTile/getTileRightPadding';
+import { Headline } from '../Headline/Headline';
+import type { PlaceholderContent } from './PlaceholderContent';
 
 export interface PlaceholderProps extends PlaceholderContent, UniBlockProps {
   className?: string;

package/mobile/src/components/ProductBlock/ProductBlock.tsx

@@ -1,8 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { ProductBlockInner } from './ProductBlockInner';
-import type { UniBlockProps } from '../../types';
-import type { ProductBlockContent } from './ProductBlockContent';
 import { VersionStyleMap } from '../../model/BlockVersion';
+import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { ProductBlockContent } from './ProductBlockContent';
+import { ProductBlockInner } from './ProductBlockInner';
 
 export interface ProductBlockProps extends ProductBlockContent, UniBlockProps {}
 

package/mobile/src/components/ProductBlock/ProductBlockInner.tsx

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../types';
+import type { BlockVersion } from '../../model/BlockVersion';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import { ButtonSection } from '../../ui-kit/Button/ButtonSection';
-import { Headline } from '../Headline/Headline';
 import { Img } from '../../ui-kit/Img/Img';
 import { List } from '../../ui-kit/List/List';
 import { BaseTile } from '../BaseTile/BaseTile';
+import { Headline } from '../Headline/Headline';
 import type { ProductBlockInnerContent } from './ProductBlockContent';
-import type { BlockVersion } from '../../model/BlockVersion';
 import { renderBenefit } from './renderBenefit';
 
 export type ProductBlockInnerProps = ProductBlockInnerContent & UniBlockProps;

package/mobile/src/components/ProductGallery/ProductGallery.tsx

@@ -1,8 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../types';
-import type { ProductGalleryContent } from './ProductGalleryContent';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import { SwipeListControl } from '../../ui-kit/SwipeListControl/SwipeListControl';
 import { ProductGalleryBlock } from './ProductGalleryBlock';
+import type { ProductGalleryContent } from './ProductGalleryContent';
 
 export interface ProductGalleryProps extends ProductGalleryContent, UniBlockProps {}
 

package/mobile/src/components/ProductGallery/ProductGalleryBlock.tsx

@@ -1,9 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { ProductBlockInner } from '../ProductBlock/ProductBlockInner';
+import { VersionStyleMap } from '../../model/BlockVersion';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import type { HeadlineProps } from '../../model/HeadlineType';
-import type { UniBlockProps } from '../../types';
 import type { ProductBlockInnerContent } from '../ProductBlock/ProductBlockContent';
-import { VersionStyleMap } from '../../model/BlockVersion';
+import { ProductBlockInner } from '../ProductBlock/ProductBlockInner';
 
 export interface ProductGalleryBlockProps extends UniBlockProps {
   headlineVersion?: HeadlineProps;

package/mobile/src/components/ProductGallery/ProductGalleryContent.ts

@@ -3,7 +3,6 @@ import type { BlockVersion } from '../../model/BlockVersion';
 
 /** @title Кнопка под слайдом */
 interface ProductGalleryNav {
-  /** @title Заголовок */
   title: string;
   /** @title Описание */
   description: string;

package/mobile/src/components/ProductTile/ProductTile.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
-import type { UniBlockProps } from '../../types';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import type { ProductTileContent, TextBenefit } from './ProductTileContent';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { ButtonSection } from '../../ui-kit/Button/ButtonSection';
@@ -66,7 +66,7 @@ function renderBenefits(benefits: TextBenefit[], version: BlockVersion, image?:
 
   return (
     <div
-      className={`z-10 grid grid-cols-[max-content_1fr] auto-rows-auto gap-x-6 gap-y-2.5 items-baseline 
+      className={`z-10 grid grid-cols-[max-content_1fr] auto-rows-auto gap-x-6 gap-y-2.5 items-baseline
         ${BENEFITS_WIDTH}`}
     >
       {benefits.length ? benefits.map(renderBenefit(version)) : null}

package/mobile/src/components/PromoTile/PromoTile.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../types';
-import type { PromoTileContent } from './PromoTileContent';
+import { VersionStyleMap } from '../../model/BlockVersion';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { ButtonSection } from '../../ui-kit/Button/ButtonSection';
 import { BaseTile } from '../BaseTile/BaseTile';
@@ -8,7 +8,7 @@ import { getTileHeadingType } from '../BaseTile/getTileHeadingType';
 import { getTileMinHeight } from '../BaseTile/getTileMinHeight';
 import { getTileRightPadding } from '../BaseTile/getTileRightPadding';
 import { Headline } from '../Headline/Headline';
-import { VersionStyleMap } from '../../model/BlockVersion';
+import type { PromoTileContent } from './PromoTileContent';
 
 export interface PromoTileProps extends PromoTileContent, UniBlockProps {}
 

package/mobile/src/components/Recommendation/Recommendation.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import type { UniBlockProps } from '../../types';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderArrows } from '../../ui-kit/Button/renderArrows';
 import { Heading } from '../../ui-kit/Heading/Heading';

package/mobile/src/components/Recommendation/RecommendationCard.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
-import type { UniBlockProps } from '../../types';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import { Description } from '../../ui-kit/Description/Description';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';

package/mobile/src/components/SafeDepositRental/SafeDepositRental.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import type { UniBlockProps } from '../../types';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import type { SafeDepositRentalContent } from './SafeDepositRentalContent';

package/mobile/src/components/StepsBlock/StepsBlock.tsx

@@ -1,12 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import type { SizeVersion } from '../../model/SizeVersion';
-import type { UniBlockProps } from '../../types';
-import type { Step, StepsBlockContent } from './StepsBlockContent';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
 import { checkIsIconRenderable } from '../../utils/checkIsIconRenderable';
+import type { Step, StepsBlockContent } from './StepsBlockContent';
 import { STEPS_BLOCK_STYLE_MAPS } from './StepsBlockStyleMaps';
+import { IconVersion } from '../../model/IconVersion';
 
 export interface StepsBlockProps extends StepsBlockContent, UniBlockProps {}
 
@@ -20,6 +21,11 @@ const STEPS_TILE_DESCRIPTION_HEIGHT_MAP: Record<SizeVersion, string> = {
   small: 'min-h-[50px]',
 };
 
+const STEPS_SVG_VERSION_MAP: Record<BlockVersion, IconVersion> = {
+  primary: 'normal',
+  secondary: 'white',
+};
+
 export const StepsBlock = JSX<StepsBlockProps>(
   ({
     className,
@@ -105,7 +111,12 @@ const renderIconArea = (size: SizeVersion, version: BlockVersion) => (step: Step
     >
       <span className={`font-medium flex self-center ${styleMap.title} ${iconTextSize}`}>
         {checkIsIconRenderable(step?.icon) ? (
-          <Img image={step.icon} width={iconSize} height={iconSize} asSVG />
+          <Img
+            image={{ ...step.icon, iconVersion: STEPS_SVG_VERSION_MAP[version] }}
+            width={iconSize}
+            height={iconSize}
+            asSVG
+          />
         ) : (
           <span>{i + 1}</span>
         )}

package/mobile/src/components/Tabs/Tabs.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { EventBus } from '../../EventBus/EventBus';
-import type { UniBlockProps } from '../../types';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderTab } from './renderTab';
 import type { Tab, TabsContent } from './TabsContent';

package/mobile/src/components/Tabs/renderTab.tsx

@@ -1,5 +1,5 @@
 import { useLink } from '../../hooks/useLink';
-import type { ContentPageDef } from '../../types';
+import type { ContentPageDef } from '../../model/ContentPageDef';
 import { assertUnreachable } from '../../utils/assertUnreachable';
 import type { ContentPageContext } from '../ContentPage/ContentPageContext';
 import { renderGroupTab } from './renderGroupTab';

package/mobile/src/components/TariffsTable/TariffsTable.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../types';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import type {
   CellDef,

package/mobile/src/components/TariffsTable/TariffsTableCell.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../types';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import type { ContentPageContext } from '../ContentPage/ContentPageContext';
 import { EmbeddableCellData } from './EmbeddableCellData';
 import type { CellDef, TariffsTableCellIndexProps } from './TariffsTableContent';

package/mobile/src/components/TariffsTable/TariffsTableHorizontal.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../types';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import { SwipeListControl } from '../../ui-kit/SwipeListControl/SwipeListControl';
 import { TariffsTableTileCell, TariffsTableTileCellProps } from './TariffsTableTileCell';
 export interface TariffsTableHorizontalProps extends UniBlockProps {

package/mobile/src/components/TariffsTable/TariffsTableRow.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { UniBlockProps } from '../../types';
+import { UniBlockProps } from '../../model/ContentPageDef';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
 import { TableCarouselContainer } from '../ComparisonTable/TableCarouselContainer';

package/mobile/src/components/TariffsTable/TariffsTableRowContainer.tsx

@@ -1,8 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { EventBus } from '../../EventBus/EventBus';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import type { VNode } from '../../model/VNode';
-import type { UniBlockProps } from '../../types';
 import { InnerTable } from '../../ui-kit/InnerTable/InnerTable';
 import type { TariffsTableInnerContent } from '../../ui-kit/InnerTable/InnerTableProps';
 

package/mobile/src/components/TariffsTable/TariffsTableVertical.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../types';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import { TariffsTableTileCell, TariffsTableTileCellProps } from './TariffsTableTileCell';
 
 export interface TariffsTableVerticalProps extends UniBlockProps {

package/mobile/src/components/TextBlock/TextBlock.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import type { Picture } from '../../model/Picture';
-import type { UniBlockProps } from '../../types';
 import { Img } from '../../ui-kit/Img/Img';
 import { List } from '../../ui-kit/List/List';
 import type { TextBlockContent, TextBlockVersion } from './TextBlockContent';

package/mobile/src/components/Tile/Tile.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { VersionStyleMap } from '../../model/BlockVersion';
-import type { UniBlockProps } from '../../types';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { ButtonSection } from '../../ui-kit/Button/ButtonSection';
 import { Description } from '../../ui-kit/Description/Description';

package/mobile/src/components/__snapshots__/Blocks.spec.tsx.snap

@@ -158,13 +158,14 @@ exports[`Blocks ErrorBlock should render block "ErrorBlock" without content 1`]
 
 exports[`Blocks ExchangeRateTile should render block "ExchangeRateTile" without content 1`] = `
 <section
-  class="bg-white text-primary-text font-sans p-9 box-border "
+  class="bg-white text-primary-text font-sans p-9 box-border min-h-[320px] 
+          "
 >
   <div
     class="font-sans flex flex-col grow h-full items-start "
   >
     <h3
-      class="font-sans m-0 text-h4 whitespace-pre-wrap text-h4"
+      class="font-sans m-0 text-h4 whitespace-pre-wrap text-h4 mb-5"
     >
       Курсы обмена валют
     </h3>
@@ -212,7 +213,7 @@ exports[`Blocks ExchangeRateTile should render block "ExchangeRateTile" without
               >
                 <svg
                   aria-hidden="true"
-                  class=""
+                  class="width: 24px  text-primary-main  "
                   height="24"
                   width="24"
                 >
@@ -223,7 +224,6 @@ exports[`Blocks ExchangeRateTile should render block "ExchangeRateTile" without
                     Иконка Gps
                   </desc>
                   <use
-                    class="text-primary-main "
                     href="icons/GpsIcon.svg#icon"
                     xlink:href="icons/GpsIcon.svg#icon"
                   />
@@ -237,7 +237,7 @@ exports[`Blocks ExchangeRateTile should render block "ExchangeRateTile" without
                     Москва, ул.Ленина д.28
                   </p>
                   <p
-                    class="text-secondary-text m-0 text-m"
+                    class="text-secondary-text m-0 text-m-light"
                   >
                     Курс указан для ближайшего офиса - 
                     6км
@@ -266,24 +266,27 @@ exports[`Blocks Footer should render block "Footer" without content 1`] = `
       href="/"
       target="_self"
     >
-      <svg
-        aria-hidden="true"
+      <div
         class="text-primary-main w-10"
-        height="45"
-        width="40"
       >
-        <title>
-          Иконка Logo
-        </title>
-        <desc>
-          Иконка Logo
-        </desc>
-        <use
-          class="text-primary-main "
-          href="icons/LogoIcon.svg#icon"
-          xlink:href="icons/LogoIcon.svg#icon"
-        />
-      </svg>
+        <svg
+          aria-hidden="true"
+          class="width: 40px  text-primary-main  "
+          height="45"
+          width="40"
+        >
+          <title>
+            Иконка Logo
+          </title>
+          <desc>
+            Иконка Logo
+          </desc>
+          <use
+            href="icons/LogoIcon.svg#icon"
+            xlink:href="icons/LogoIcon.svg#icon"
+          />
+        </svg>
+      </div>
       <span
         class="text-primary-text font-medium ml-2.5"
       >
@@ -469,24 +472,27 @@ exports[`Blocks Header should render block "Header" without content 1`] = `
         href="/"
         target="_self"
       >
-        <svg
-          aria-hidden="true"
+        <div
           class="text-primary-main w-10"
-          height="45"
-          width="40"
         >
-          <title>
-            Иконка Logo
-          </title>
-          <desc>
-            Иконка Logo
-          </desc>
-          <use
-            class="text-primary-main "
-            href="icons/LogoIcon.svg#icon"
-            xlink:href="icons/LogoIcon.svg#icon"
-          />
-        </svg>
+          <svg
+            aria-hidden="true"
+            class="width: 40px  text-primary-main  "
+            height="45"
+            width="40"
+          >
+            <title>
+              Иконка Logo
+            </title>
+            <desc>
+              Иконка Logo
+            </desc>
+            <use
+              href="icons/LogoIcon.svg#icon"
+              xlink:href="icons/LogoIcon.svg#icon"
+            />
+          </svg>
+        </div>
         <span
           class="text-primary-text font-medium ml-2.5"
         >
@@ -526,22 +532,25 @@ exports[`Blocks Header should render block "Header" without content 1`] = `
           disabled=""
           type="button"
         >
-          <svg
-            aria-hidden="true"
+          <div
             class="h-full pointer-events-none"
           >
-            <title>
-              Иконка Лупа
-            </title>
-            <desc>
-              Иконка Лупа
-            </desc>
-            <use
-              class="text-black group-hover:text-primary-hover group-hover:invert-0 pointer-events-none"
-              href="icons/LoupeIcon.svg#icon"
-              xlink:href="icons/LoupeIcon.svg#icon"
-            />
-          </svg>
+            <svg
+              aria-hidden="true"
+              class="w-full h-full text-black group-hover:text-primary-hover group-hover:invert-0 pointer-events-none "
+            >
+              <title>
+                Иконка Лупа
+              </title>
+              <desc>
+                Иконка Лупа
+              </desc>
+              <use
+                href="icons/LoupeIcon.svg#icon"
+                xlink:href="icons/LoupeIcon.svg#icon"
+              />
+            </svg>
+          </div>
         </button>
         <button
           aria-label="Дополнительные ссылки"
@@ -549,22 +558,25 @@ exports[`Blocks Header should render block "Header" without content 1`] = `
           disabled=""
           type="button"
         >
-          <svg
-            aria-hidden="true"
+          <div
             class="h-full bg-main-divider/20 rounded-full pointer-events-none"
           >
-            <title>
-              Иконка Сетка (белая)
-            </title>
-            <desc>
-              Иконка Сетка (белая)
-            </desc>
-            <use
-              class="text-black group-hover:text-primary-hover group-hover:invert-0"
-              href="icons/GridIcon.svg#icon"
-              xlink:href="icons/GridIcon.svg#icon"
-            />
-          </svg>
+            <svg
+              aria-hidden="true"
+              class="w-full h-full text-black group-hover:text-primary-hover group-hover:invert-0 "
+            >
+              <title>
+                Иконка Сетка (белая)
+              </title>
+              <desc>
+                Иконка Сетка (белая)
+              </desc>
+              <use
+                href="icons/GridIcon.svg#icon"
+                xlink:href="icons/GridIcon.svg#icon"
+              />
+            </svg>
+          </div>
         </button>
       </div>
     </div>
@@ -772,7 +784,7 @@ exports[`Blocks ProductBlock should render block "ProductBlock" without content
 
 exports[`Blocks ProductGallery should render block "ProductGallery" without content 1`] = `
 <section
-  class="box-border pt-[50px] overflow-hidden relative font-sans w-100 
+  class="box-border pt-[50px] overflow-hidden relative font-sans w-100 mb-6 
         bg-white text-primary-text"
 >
   <div
@@ -795,7 +807,7 @@ exports[`Blocks ProductTile should render block "ProductTile" without content 1`
     class="font-sans flex flex-col p-[50px] gap-2 bg-white !p-0 !bg-transparent z-10 "
   />
   <div
-    class="z-10 grid grid-cols-[max-content_1fr] auto-rows-auto gap-x-6 gap-y-2.5 items-baseline 
+    class="z-10 grid grid-cols-[max-content_1fr] auto-rows-auto gap-x-6 gap-y-2.5 items-baseline
         100%"
   />
 </section>
@@ -1120,24 +1132,15 @@ exports[`Blocks SafeDepositRental should render block "SafeDepositRental" withou
         <div
           class="bg-primary-main px-10 pt-10 pb-4 text-center"
         >
-          <svg
+          <img
+            alt="Иконка Пачка бумаги А4"
             aria-hidden="true"
             class=""
             height="257"
+            src="icons/PackA4Icon.svg"
+            title="Иконка Пачка бумаги А4"
             width="290"
-          >
-            <title>
-              Иконка Пачка бумаги А4
-            </title>
-            <desc>
-              Иконка Пачка бумаги А4
-            </desc>
-            <use
-              class="text-primary-main "
-              href="icons/PackA4Icon.svg#icon"
-              xlink:href="icons/PackA4Icon.svg#icon"
-            />
-          </svg>
+          />
           <span
             class="text-s-light text-white opacity-80 mt-2 inline-block"
           >

package/mobile/src/content-page-repository/ContentPageRepository.ts

@@ -1,6 +1,6 @@
 import glob from 'glob';
 import util from 'util';
-import type { ContentPageDef } from '../types';
+import type { ContentPageDef } from '../model/ContentPageDef';
 import type { TransformationOptions } from './TransformationOptions';
 import { transformContentPage } from './transformContentPage';
 

package/mobile/src/content-page-repository/transformContentPage.ts

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import util from 'util';
+import type { ContentPageDef } from '../model/ContentPageDef';
 import type { Picture } from '../model/Picture';
-import type { ContentPageDef } from '../types';
 import { mapJSON } from './mapJSON';
 import type { TransformationOptions } from './TransformationOptions';
 import { transformMarkdown } from './transformMarkdown';