@gravity-ui/blog-constructor 5.16.1-alpha.1 → 6.0.0

package/build/esm/i18n/index.js

@@ -1,7 +1,5 @@
-import { I18N } from '@gravity-ui/i18n';
-import { Lang } from '../models/locale';
-const KEYSET_NAME = 'blog';
-export const i18n = new I18N();
+import { addComponentKeysets } from '@gravity-ui/uikit/i18n';
+const NAMESPACE = 'blog';
 export var Keyset;
 (function (Keyset) {
     Keyset["Title"] = "title";
@@ -24,7 +22,7 @@ export var Keyset;
     Keyset["PromptSignInOnLike"] = "prompt_sign_in_on_like";
     Keyset["SignIn"] = "Sign In";
 })(Keyset || (Keyset = {}));
-i18n.registerKeyset(Lang.En, KEYSET_NAME, {
+const en = {
     [Keyset.Title]: 'Blog',
     [Keyset.TitleBreadcrumbs]: 'Blog',
     [Keyset.TitleSuggest]: 'See also',
@@ -48,8 +46,8 @@ i18n.registerKeyset(Lang.En, KEYSET_NAME, {
         '{{count}} mins to read',
     ],
     [Keyset.SignIn]: 'Sign In',
-});
-i18n.registerKeyset(Lang.Ru, KEYSET_NAME, {
+};
+const ru = {
     [Keyset.Title]: 'Блог',
     [Keyset.TitleBreadcrumbs]: 'Блог',
     [Keyset.TitleSuggest]: 'Читать также',
@@ -73,5 +71,5 @@ i18n.registerKeyset(Lang.Ru, KEYSET_NAME, {
         '{{count}} минут чтения',
     ],
     [Keyset.SignIn]: 'Войти',
-});
-export const i18 = i18n.keyset(KEYSET_NAME);
+};
+export const i18n = addComponentKeysets({ en, ru }, NAMESPACE);

package/build/esm/index.d.ts

@@ -1,4 +1,3 @@
-export { configure } from './configure';
 export { BlogConstructorProvider } from './constructor/BlogConstructorProvider';
 export { BlogPostPage } from './containers/BlogPostPage/BlogPostPage';
 export { BlogPage } from './containers/BlogPage/BlogPage';

package/build/esm/index.js

@@ -1,4 +1,3 @@
-export { configure } from './configure';
 export { BlogConstructorProvider } from './constructor/BlogConstructorProvider';
 export { BlogPostPage } from './containers/BlogPostPage/BlogPostPage';
 export { BlogPage } from './containers/BlogPage/BlogPage';

package/build/esm/models/common.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { MarkdownItPluginCb } from '@doc-tools/transform/lib/plugins/typings';
+import { MarkdownItPluginCb } from '@diplodoc/transform/lib/plugins/typings';
 import { HeaderBlockProps as PageConstructorHeaderBlockProps } from '@gravity-ui/page-constructor';
 import { IBrowser, IDevice } from 'ua-parser-js';
 import { Locale } from '../models/locale';

package/build/esm/models/locale.d.ts

@@ -1,7 +1,4 @@
-export declare enum Lang {
-    Ru = "ru",
-    En = "en"
-}
+import { Lang } from '@gravity-ui/uikit';
 export declare enum Currency {
     RUB = "RUB",
     USD = "USD",

package/build/esm/models/locale.js

@@ -1,8 +1,3 @@
-export var Lang;
-(function (Lang) {
-    Lang["Ru"] = "ru";
-    Lang["En"] = "en";
-})(Lang || (Lang = {}));
 export var Currency;
 (function (Currency) {
     Currency["RUB"] = "RUB";

package/build/esm/utils/common.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="lodash" />
-import { ContentBlockProps, HeaderBreadCrumbsProps, MetrikaGoal, NewMetrikaGoal } from '@gravity-ui/page-constructor';
+import { AnalyticsEvent, AnalyticsEventsProp, ContentBlockProps, HeaderBreadCrumbsProps } from '@gravity-ui/page-constructor';
 import { RouterContextProps } from '../contexts/RouterContext';
 import { GetPostsRequest, Query, Tag } from '../models/common';
+import { AnalyticsCounter } from '../counters/utils';
 export interface QueryParam {
     name: string;
     value?: string | number | null;
@@ -38,9 +39,20 @@ type GetBreadcrumbsProps = {
 };
 export declare const getBlogPath: (pathPrefix: string) => string;
 export declare const getBreadcrumbs: ({ tags, blogPath }: GetBreadcrumbsProps) => HeaderBreadCrumbsProps;
-export declare const isMetrikaExist: (goal: NewMetrikaGoal, existGoals: NewMetrikaGoal[]) => boolean;
-export declare const getBlogElementMetrika: (blogCustomGoal: NewMetrikaGoal, existingGoals?: MetrikaGoal) => string | string[] | NewMetrikaGoal[];
+export declare const getMergedAnalyticsEvents: (analyticEvents: AnalyticsEventsProp, existringEvents?: AnalyticsEventsProp) => {
+    name: string;
+    type?: string | undefined;
+    counters?: import("@gravity-ui/page-constructor").AnalyticsCounters | undefined;
+    context?: string | undefined;
+    target?: string | undefined;
+}[];
 export declare const getFeedQueryParams: (queryString: Query, pageNumber?: number) => GetPostsRequest;
 export declare const scrollOnPageChange: (containerId: string) => void;
 export declare const getQaAttributes: (qa?: string, ...customKeys: (string | Array<string>)[]) => Record<string, string>;
+type PrepareAnalyticsEventArgs = {
+    name: string;
+    counter?: AnalyticsCounter;
+    options?: Record<string, string | number>;
+};
+export declare const prepareAnalyticsEvent: ({ name, counter, options, }: PrepareAnalyticsEventArgs) => AnalyticsEvent;
 export {};

package/build/esm/utils/common.js

@@ -1,12 +1,12 @@
 import { __rest } from "tslib";
 import { format, parse } from 'url';
-import { isNewMetrikaFormat, } from '@gravity-ui/page-constructor';
 import camelCase from 'lodash/camelCase';
 import debounce from 'lodash/debounce';
 import flatten from 'lodash/flatten';
 import memoize from 'lodash/memoize';
 import { CONTENT_DEFAULT_COL_SIZES, CONTENT_DEFAULT_SIZE, CONTENT_DEFAULT_THEME, DEFAULT_PAGE, DEFAULT_ROWS_PER_PAGE, } from '../blocks/constants';
-import { Keyset, i18 } from '../i18n';
+import { Keyset, i18n } from '../i18n';
+import { AnalyticsCounter } from '../counters/utils';
 const QA_ATTRIBUTES_KEYS = ['container', 'content', 'wrapper', 'image', 'button'];
 export function getAbsolutePath(router, url) {
     if (!router || !router.pathname) {
@@ -54,7 +54,7 @@ export const getBlogPath = (pathPrefix) => {
 };
 export const getBreadcrumbs = ({ tags, blogPath }) => {
     const breadcrumbs = {
-        items: [{ text: i18(Keyset.TitleBreadcrumbs), url: blogPath }],
+        items: [{ text: i18n(Keyset.TitleBreadcrumbs), url: blogPath }],
         theme: 'light',
     };
     if (tags === null || tags === void 0 ? void 0 : tags.length) {
@@ -65,21 +65,19 @@ export const getBreadcrumbs = ({ tags, blogPath }) => {
     }
     return breadcrumbs;
 };
-export const isMetrikaExist = (goal, existGoals) => {
-    return Boolean(existGoals.find((existGoal) => goal.name === existGoal.name));
-};
-export const getBlogElementMetrika = (blogCustomGoal, existingGoals) => {
-    if (existingGoals) {
-        if (isNewMetrikaFormat(existingGoals) && !isMetrikaExist(blogCustomGoal, existingGoals)) {
-            const goals = [...existingGoals];
-            goals.push(blogCustomGoal);
-            return goals;
-        }
-        return existingGoals;
+const getArrayOfEvents = (events) => {
+    if (!events) {
+        return [];
     }
-    else {
-        return [blogCustomGoal];
+    if (Array.isArray(events)) {
+        return events;
     }
+    return [events];
+};
+export const getMergedAnalyticsEvents = (analyticEvents, existringEvents) => {
+    const eventsAsArray = getArrayOfEvents(analyticEvents);
+    const existingAsArray = getArrayOfEvents(existringEvents);
+    return eventsAsArray.concat(existingAsArray);
 };
 export const getFeedQueryParams = (queryString, pageNumber) => {
     const queryParams = getPageSearchParams(queryString);
@@ -109,4 +107,7 @@ export const getQaAttributes = (qa, ...customKeys) => {
         attributes.default = qa;
     }
     return attributes;
-};
+};
+export const prepareAnalyticsEvent = ({ name, counter = AnalyticsCounter.Main, options = {}, }) => (Object.assign(Object.assign({}, options), { name, counters: {
+        include: [counter],
+    } }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/blog-constructor",
-  "version": "5.16.1-alpha.1",
+  "version": "6.0.0",
   "description": "Gravity UI Blog Constructor",
   "license": "MIT",
   "repository": {
@@ -60,8 +60,8 @@
   },
   "dependencies": {
     "@bem-react/classname": "^1.6.0",
-    "@gravity-ui/components": "^2.8.0",
-    "@gravity-ui/i18n": "^1.1.0",
+    "@gravity-ui/components": "^3.0.0",
+    "@gravity-ui/i18n": "^1.3.0",
     "lodash": "^4.17.21",
     "react-helmet": "^6.1.0",
     "ua-parser-js": "^0.7.28",
@@ -70,9 +70,9 @@
     "uuid": "^9.0.1"
   },
   "peerDependencies": {
-    "@doc-tools/transform": "^3.3.2",
-    "@gravity-ui/page-constructor": "^4.45.0",
-    "@gravity-ui/uikit": "^5.12.0",
+    "@diplodoc/transform": "^4.10.7",
+    "@gravity-ui/page-constructor": "^5.0.0",
+    "@gravity-ui/uikit": "^6.1.1",
     "react": "^16.0.0 || ^17.0.0 || ^18.0.0"
   },
   "devDependencies": {
@@ -80,19 +80,20 @@
     "@babel/preset-react": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
     "@commitlint/config-conventional": "^17.4.3",
-    "@doc-tools/transform": "^3.11.0",
+    "@diplodoc/transform": "^4.10.8",
     "@gravity-ui/eslint-config": "^3.1.1",
-    "@gravity-ui/page-constructor": "^4.46.0",
+    "@gravity-ui/page-constructor": "^5.1.0",
     "@gravity-ui/prettier-config": "^1.1.0",
     "@gravity-ui/stylelint-config": "^4.0.1",
     "@gravity-ui/tsconfig": "^1.0.0",
-    "@gravity-ui/uikit": "^5.25.0",
+    "@gravity-ui/uikit": "^6.2.0",
     "@jest/environment": "^29.7.0",
-    "@storybook/addon-essentials": "^7.0.27",
-    "@storybook/cli": "^7.0.27",
+    "@storybook/addon-essentials": "^7.6.17",
+    "@storybook/addon-mdx-gfm": "^7.6.17",
+    "@storybook/cli": "^7.6.17",
     "@storybook/preset-scss": "^1.0.3",
-    "@storybook/react": "^7.0.27",
-    "@storybook/react-webpack5": "^7.0.27",
+    "@storybook/react": "^7.6.17",
+    "@storybook/react-webpack5": "^7.6.17",
     "@testing-library/dom": "^9.3.3",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
@@ -127,7 +128,7 @@
     "rimraf": "^3.0.2",
     "sass": "^1.54.4",
     "sass-loader": "^13.3.1",
-    "storybook": "^7.0.27",
+    "storybook": "^7.6.17",
     "stylelint": "^15.11.0",
     "ts-jest": "^29.0.5",
     "typescript": "^4.9.3"

package/server/data/contentFilter.d.ts

@@ -1,5 +1,5 @@
 import { PageContent } from '@gravity-ui/page-constructor';
-import { Lang } from '../models/locale';
+import { Lang } from '@gravity-ui/uikit';
 type FilteringOptions = {
     lang: Lang;
     region?: string;

package/server/data/contentFilter.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.filterContent = exports.filterItems = void 0;
 const tslib_1 = require("tslib");
-const evaluation_1 = tslib_1.__importDefault(require("@doc-tools/transform/lib/liquid/evaluation"));
+// eslint-disable-next-line import/no-extraneous-dependencies
+const evaluation_1 = tslib_1.__importDefault(require("@diplodoc/transform/lib/liquid/evaluation"));
 /**
  * Filters items by expression and removes empty items.
  * @param {Array} items

package/server/data/transformPageContent.d.ts

@@ -1,5 +1,5 @@
-import { MarkdownItPluginCb } from '@doc-tools/transform/lib/plugins/typings';
-import { Lang } from '../models/locale';
+import { MarkdownItPluginCb } from '@diplodoc/transform/lib/plugins/typings';
+import { Lang } from '@gravity-ui/uikit';
 type TypographyConfigType = {
     [x: string]: Record<string, unknown>;
 };

package/server/data/transformPost.d.ts

@@ -1,5 +1,10 @@
 import { PostData, TransformPostOptions } from '../models/common';
-import { Lang } from '../models/locale';
+import { Lang } from '@gravity-ui/uikit';
+export type TransformPostType = {
+    postData: PostData;
+    lang: Lang;
+    options: TransformPostOptions;
+};
 /**
  * Func for transform post data
  *
@@ -9,4 +14,4 @@ import { Lang } from '../models/locale';
  * @param plugins - YFM plugins list
  * @returns -prepared post
  */
-export declare const transformPost: (postData: PostData, lang: Lang, { plugins }?: TransformPostOptions) => PostData;
+export declare const transformPost: ({ postData, lang, options: { plugins } }: TransformPostType) => PostData;

package/server/data/transformPost.js

@@ -12,7 +12,7 @@ const server_1 = require("@gravity-ui/page-constructor/server");
  * @param plugins - YFM plugins list
  * @returns -prepared post
  */
-const transformPost = (postData, lang, { plugins } = {}) => {
+const transformPost = ({ postData, lang, options: { plugins } = {} }) => {
     if (!postData) {
         // eslint-disable-next-line no-console
         console.error('Post not found');

package/server/index.d.ts

@@ -1,4 +1,4 @@
 export { transformPageContent } from "./data/transformPageContent";
 export { createReadableContent } from "./data/createReadableContent";
 export { sanitizeMeta } from "./data/sanitizeMeta";
-export { transformPost } from "./data/transformPost";
+export { transformPost, TransformPostType } from "./data/transformPost";

package/server/models/common.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { MarkdownItPluginCb } from '@doc-tools/transform/lib/plugins/typings';
+import { MarkdownItPluginCb } from '@diplodoc/transform/lib/plugins/typings';
 import { HeaderBlockProps as PageConstructorHeaderBlockProps } from '@gravity-ui/page-constructor';
 import { IBrowser, IDevice } from 'ua-parser-js';
 import { Locale } from '../models/locale';

package/server/models/locale.d.ts

@@ -1,7 +1,4 @@
-export declare enum Lang {
-    Ru = "ru",
-    En = "en"
-}
+import { Lang } from '@gravity-ui/uikit';
 export declare enum Currency {
     RUB = "RUB",
     USD = "USD",

package/server/models/locale.js

@@ -1,11 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Currency = exports.Lang = void 0;
-var Lang;
-(function (Lang) {
-    Lang["Ru"] = "ru";
-    Lang["En"] = "en";
-})(Lang = exports.Lang || (exports.Lang = {}));
+exports.Currency = void 0;
 var Currency;
 (function (Currency) {
     Currency["RUB"] = "RUB";

package/styles/storybook/common.scss

@@ -1,3 +1,5 @@
+@import '../mixins.scss';
+
 .demo-container {
     min-height: calc(100vh - 1px);
     padding: 50px;
@@ -33,3 +35,9 @@
     --pc-first-block-indent: 64px;
     margin-bottom: 120px;
 }
+
+.pc-layout {
+    @include add-specificity(&) {
+        min-height: auto;
+    }
+}

package/styles/storybook/index.scss

@@ -3,7 +3,7 @@
 @import './common';
 @import './palette';
 @import './typography';
-@import '~@doc-tools/transform/dist/css/yfm.css';
+@import '~@diplodoc/transform/dist/css/yfm.css';
 /**
  * storybook-host container style overrides
  * @see {@link https://github.com/philcockfield/storybook-host/issues/43}

package/styles/styles.css

@@ -1,4 +1,119 @@
 @import '~@gravity-ui/uikit/styles/styles.css';
+/* use this for style redefinitions to awoid problems with
+unpredictable css rules order in build */
+.yfm_blog {
+  font-size: var(--g-text-body-3-font-size);
+  line-height: var(--g-text-body-3-line-height);
+  color: var(--g-color-text-primary);
+}
+.yfm_blog h1:first-child,
+.yfm_blog h2:first-child,
+.yfm_blog h3:first-child,
+.yfm_blog h4:first-child {
+  padding: 0;
+  margin-top: 0;
+  padding-top: 0;
+}
+.yfm_blog h2 {
+  font-size: var(--g-text-display-2-font-size);
+  line-height: var(--g-text-display-2-line-height);
+}
+.yfm_blog h3 {
+  font-size: var(--g-text-header-2-font-size);
+  line-height: var(--g-text-header-2-line-height);
+}
+.yfm_blog h4 {
+  font-size: var(--g-text-header-1-font-size);
+  line-height: var(--g-text-header-1-line-height);
+}
+.yfm_blog.yfm_blog h1,
+.yfm_blog.yfm_blog h2,
+.yfm_blog.yfm_blog h3,
+.yfm_blog.yfm_blog h4,
+.yfm_blog.yfm_blog h5,
+.yfm_blog.yfm_blog h6 {
+  margin-bottom: 16px;
+  margin-top: 32px;
+  padding-top: 0;
+  font-weight: var(--g-text-header-font-weight);
+}
+
+.yfm_blog blockquote,
+.yfm_blog dl,
+.yfm_blog ol,
+.yfm_blog p,
+.yfm_blog pre,
+.yfm_blog table,
+.yfm_blog ul {
+  margin: 0 0 16px;
+}
+.yfm_blog img {
+  margin-bottom: 32px;
+  margin-top: 16px;
+  border-radius: 24px;
+}
+.yfm_blog hr {
+  height: 1px;
+}
+.yfm_blog ol,
+.yfm_blog ul {
+  padding-left: 1.4em;
+}
+.yfm_blog code {
+  color: var(--g-color-text-misc);
+}
+.yfm_blog pre > code {
+  color: var(--g-color-text-primary);
+}
+.yfm_blog table {
+  color: var(--g-color-text-primary);
+  border: 1px solid var(--g-color-line-generic);
+  background: var(--g-color-base-background);
+}
+.yfm_blog thead tr,
+.yfm_blog table tr:nth-child(2n) {
+  background-color: var(--g-color-base-generic);
+}
+.yfm_blog_media {
+  font-size: var(--g-text-body-3-font-size);
+  line-height: var(--g-text-body-3-line-height);
+  color: var(--g-color-text-secondary);
+}
+.yfm_blog_breadcrumbs {
+  font-size: var(--g-text-body-2-font-size);
+  line-height: var(--g-text-body-2-line-height);
+  color: var(--g-text-color-base);
+}
+.yfm_blog a {
+  color: var(--g-color-text-link);
+  border-radius: var(--g-focus-border-radius);
+}
+.yfm_blog a:hover {
+  color: var(--g-color-text-link-hover);
+}
+.yfm_blog a:focus {
+  box-shadow: 0 0 0 2px var(--g-color-line-focus);
+}
+.yfm_blog a:focus:not(:focus-visible) {
+  box-shadow: none;
+}
+.yfm_blog a:focus {
+  outline: 0;
+}
+.yfm_blog .yfm-tab:hover, .yfm_blog .yfm-tab:active {
+  color: var(--g-color-text-link-hover);
+}
+.yfm_blog .yfm-tab.active {
+  border-bottom-color: var(--g-color-text-link);
+}
+.yfm_blog .yfm-clipboard {
+  margin: 32px 0;
+}
+
+.yfm_blog_card p {
+  color: var(--pc-text-header-color);
+}
+
 @font-face {
   font-family: "YS Display";
   src: url("https://yastatic.net/s3/home/fonts/ys/1/display-thin.woff2") format("woff2"), url("https://yastatic.net/s3/home/fonts/ys/1/display-thin.woff") format("woff");

package/styles/styles.scss

@@ -1,2 +1,3 @@
 @import '~@gravity-ui/uikit/styles/styles.css';
+@import './yfm.scss';
 @import './fonts.scss';

package/build/cjs/configure.d.ts

@@ -1,5 +0,0 @@
-import { Lang } from './models/locale';
-export interface ProjectConfigParams {
-    lang: Lang;
-}
-export declare const configure: ({ lang }: ProjectConfigParams) => void;

package/build/cjs/configure.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.configure = void 0;
-const i18n_1 = require("./i18n");
-const configure = ({ lang }) => {
-    i18n_1.i18n.setLang(lang);
-};
-exports.configure = configure;

package/build/esm/configure.d.ts

@@ -1,5 +0,0 @@
-import { Lang } from './models/locale';
-export interface ProjectConfigParams {
-    lang: Lang;
-}
-export declare const configure: ({ lang }: ProjectConfigParams) => void;

package/build/esm/configure.js

@@ -1,4 +0,0 @@
-import { i18n } from './i18n';
-export const configure = ({ lang }) => {
-    i18n.setLang(lang);
-};