@gravity-ui/blog-constructor 7.0.0-alpha.1 → 7.0.0-beta.1

package/package.json

@@ -1,17 +1,23 @@
 {
   "name": "@gravity-ui/blog-constructor",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-beta.1",
   "description": "Gravity UI Blog Constructor",
   "license": "MIT",
+  "type": "commonjs",
   "repository": {
     "type": "git",
     "url": "https://github.com/gravity-ui/blog-constructor"
   },
   "exports": {
     ".": {
-      "types": "./build/esm/index.d.ts",
-      "require": "./build/cjs/index.js",
-      "import": "./build/esm/index.js"
+      "import": {
+        "types": "./build/esm/index.d.ts",
+        "default": "./build/esm/index.js"
+      },
+      "require": {
+        "types": "./build/cjs/index.d.ts",
+        "default": "./build/cjs/index.js"
+      }
     },
     "./server": {
       "types": "./server/index.d.ts",
@@ -47,7 +53,9 @@
     "dev": "npm run storybook:start",
     "start": "node dist",
     "clean": "gulp clean",
-    "build": "npm run clean && gulp",
+    "build": "run-p build:client build:server",
+    "build:client": "gulp",
+    "build:server": "rimraf server && tsc -p tsconfig.server.json && move-file server/server.js server/index.js && move-file server/server.d.ts server/index.d.ts",
     "storybook:start": "storybook dev -p 7010",
     "storybook:build": "storybook build -c .storybook -o storybook-static",
     "prepublishOnly": "npm run lint && npm run build",
@@ -67,8 +75,13 @@
   },
   "dependencies": {
     "@bem-react/classname": "^1.6.0",
-    "@gravity-ui/components": "^3.4.2",
-    "@gravity-ui/i18n": "^1.4.0",
+    "@chromatic-com/storybook": "^3.2.4",
+    "@gravity-ui/components": "^4.0.0-beta.5",
+    "@gravity-ui/gulp-utils": "^1.0.0",
+    "@gravity-ui/i18n": "^1.7.0",
+    "gulp-cli": "^3.0.0",
+    "gulp-sass": "^6.0.0",
+    "gulp-sourcemaps": "^3.0.0",
     "lodash": "^4.17.21",
     "react-helmet": "^6.1.0",
     "ua-parser-js": "^0.7.28",
@@ -78,22 +91,22 @@
   },
   "peerDependencies": {
     "@diplodoc/transform": "^4.10.7",
-    "@gravity-ui/page-constructor": "^6.0.0-alpha.2",
-    "@gravity-ui/uikit": "^6.26.0",
+    "@gravity-ui/page-constructor": "^6.0.0-beta.3",
+    "@gravity-ui/uikit": "^7.0.0-beta.6",
     "react": "^16.0.0 || ^17.0.0 || ^18.0.0"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.22.9",
-    "@babel/preset-react": "^7.22.5",
-    "@babel/preset-typescript": "^7.22.5",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-react": "^7.26.3",
+    "@babel/preset-typescript": "^7.26.0",
     "@commitlint/config-conventional": "^17.4.3",
     "@diplodoc/transform": "^4.10.8",
-    "@gravity-ui/eslint-config": "^3.1.1",
-    "@gravity-ui/page-constructor": "^6.0.0-alpha.2",
+    "@gravity-ui/eslint-config": "^3.2.0",
+    "@gravity-ui/page-constructor": "^6.0.0-beta.3",
     "@gravity-ui/prettier-config": "^1.1.0",
     "@gravity-ui/stylelint-config": "^4.0.1",
     "@gravity-ui/tsconfig": "^1.0.0",
-    "@gravity-ui/uikit": "^6.26.0",
+    "@gravity-ui/uikit": "^7.0.0-beta.6",
     "@jest/environment": "^29.7.0",
     "@playwright/experimental-ct-react": "^1.45.3",
     "@playwright/test": "^1.45.3",
@@ -106,12 +119,12 @@
     "@storybook/react-webpack5": "^8.0.5",
     "@testing-library/dom": "^9.3.3",
     "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/react": "^14.0.0",
+    "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.4.3",
-    "@types/jest": "^29.2.5",
+    "@types/jest": "^29.5.14",
     "@types/js-yaml": "^4.0.5",
     "@types/lodash": "^4.14.176",
-    "@types/react": "^18.0.26",
+    "@types/react": "^18.3.18",
     "@types/react-helmet": "^6.1.5",
     "@types/ua-parser-js": "^0.7.36",
     "@types/uuid": "^9.0.7",
@@ -119,9 +132,8 @@
     "eslint": "^8.34.0",
     "eslint-plugin-no-not-accumulator-reassign": "^0.1.0",
     "eslint-plugin-testing-library": "^5.9.1",
-    "gulp": "^4.0.2",
+    "gulp": "^5.0.0",
     "gulp-dart-sass": "^1.0.2",
-    "gulp-rename": "^2.0.0",
     "gulp-replace": "^1.1.3",
     "gulp-typescript": "^6.0.0-alpha.1",
     "html-loader": "^1.3.2",
@@ -131,18 +143,19 @@
     "jest-transform-css": "^6.0.1",
     "js-yaml": "^3.14.1",
     "lint-staged": "^11.2.6",
+    "move-file-cli": "^3.0.0",
     "npm-run-all": "^4.1.5",
     "postcss": "^8.4.14",
-    "prettier": "^3.0.3",
+    "prettier": "^3.4.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "rimraf": "^3.0.2",
+    "rimraf": "^6.0.1",
     "sass": "^1.54.4",
     "sass-loader": "^13.3.1",
     "storybook": "^8.0.5",
     "stylelint": "^15.11.0",
-    "ts-jest": "^29.0.5",
-    "typescript": "^4.9.3",
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.7.3",
     "vite-plugin-commonjs": "^0.10.3",
     "vite-plugin-svgr": "^4.2.0"
   },

package/server/data/config.js

@@ -36,4 +36,4 @@ exports.getExtendTypographyConfig = getExtendTypographyConfig;
 const getConfigForCreateReadableContent = () => BLOCKS_FOR_TYPOGRAPHY_TRANSFORM.reduce((result, current) => (Object.assign({ [current]: {
         fields: ['text'],
     } }, result)), {});
-exports.getConfigForCreateReadableContent = getConfigForCreateReadableContent;
+exports.getConfigForCreateReadableContent = getConfigForCreateReadableContent;

package/server/data/contentFilter.js

@@ -1,9 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.filterContent = exports.filterItems = void 0;
-const tslib_1 = require("tslib");
 // eslint-disable-next-line import/no-extraneous-dependencies
-const evaluation_1 = tslib_1.__importDefault(require("@diplodoc/transform/lib/liquid/evaluation"));
+const evaluation_1 = __importDefault(require("@diplodoc/transform/lib/liquid/evaluation"));
 /**
  * Filters items by expression and removes empty items.
  * @param {Array} items
@@ -58,4 +60,4 @@ const filterContent = (content, options) => {
         return content;
     }
 };
-exports.filterContent = filterContent;
+exports.filterContent = filterContent;

package/server/data/createReadableContent.js

@@ -44,4 +44,4 @@ const createReadableContent = ({ content = '', blocks, authors = [], }) => {
         return '';
     }
 };
-exports.createReadableContent = createReadableContent;
+exports.createReadableContent = createReadableContent;

package/server/data/sanitizeMeta.d.ts

@@ -11,7 +11,7 @@ export declare const sanitizeMeta: (metaData: PostMetaProps) => {
     image: string;
     canonicalUrl: string;
     organization: import("../models/common").MetaOrganizationType;
-    content?: string | undefined;
+    content?: string;
     sharing: {
         shareTitle: string;
         shareDescription: string;
@@ -19,8 +19,8 @@ export declare const sanitizeMeta: (metaData: PostMetaProps) => {
         shareGenImage: string;
         shareGenTitle: string;
     };
-    keywords?: string[] | undefined;
-    noIndex?: boolean | undefined;
-    authors?: import("../models/common").Author[] | undefined;
-    tags?: import("../models/common").Tag[] | undefined;
+    keywords?: string[];
+    noIndex?: boolean;
+    authors?: import("../models/common").Author[];
+    tags?: import("../models/common").Tag[];
 };

package/server/data/sanitizeMeta.js

@@ -17,4 +17,4 @@ const sanitizeMeta = (metaData) => {
     }, {});
     return Object.assign(Object.assign({}, metaData), { title: (0, server_1.sanitizeHtml)(title), description: (0, server_1.sanitizeHtml)(description), date: (0, server_1.sanitizeHtml)(date), image: (0, server_1.sanitizeHtml)(image), canonicalUrl: (0, server_1.sanitizeHtml)(canonicalUrl), organization: sanitizedOrganization });
 };
-exports.sanitizeMeta = sanitizeMeta;
+exports.sanitizeMeta = sanitizeMeta;

package/server/data/transformPageContent.js

@@ -1,9 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformPageContent = void 0;
-const tslib_1 = require("tslib");
 const server_1 = require("@gravity-ui/page-constructor/server");
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const js_yaml_1 = __importDefault(require("js-yaml"));
 const config_1 = require("./config");
 const contentFilter_1 = require("./contentFilter");
 const transformer = ({ blocks, lang, typographyConfig, plugins }) => (0, server_1.contentTransformer)({
@@ -46,4 +48,4 @@ const transformPageContent = ({ content, lang, region, typographyConfig = {}, pl
         return {};
     }
 };
-exports.transformPageContent = transformPageContent;
+exports.transformPageContent = transformPageContent;

package/server/data/transformPost.js

@@ -1,7 +1,17 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformPost = void 0;
-const tslib_1 = require("tslib");
 const server_1 = require("@gravity-ui/page-constructor/server");
 /**
  * Func for transform post data
@@ -18,7 +28,8 @@ const transformPost = ({ postData, lang, options: { plugins } = {} }) => {
         console.error('Post not found');
         return {};
     }
-    const { tags, title, metaTitle, description } = postData, post = tslib_1.__rest(postData, ["tags", "title", "metaTitle", "description"]);
-    return Object.assign(Object.assign({}, post), { title: (0, server_1.yfmTransformer)(lang, title, { plugins }), tags, textTitle: (0, server_1.typografToText)(title, lang), htmlTitle: (0, server_1.typografToHTML)(title, lang), metaTitle: metaTitle || title, description: (0, server_1.yfmTransformer)(lang, description, { plugins }) });
+    const { tags, title, metaTitle, description } = postData, post = __rest(postData, ["tags", "title", "metaTitle", "description"]);
+    return Object.assign(Object.assign({}, post), { title,
+        tags, textTitle: (0, server_1.typografToText)(title, lang), htmlTitle: (0, server_1.typografToHTML)(title, lang), metaTitle: metaTitle || title, description: (0, server_1.yfmTransformer)(lang, description, { plugins }) });
 };
-exports.transformPost = transformPost;
+exports.transformPost = transformPost;

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, TransformPostType } from "./data/transformPost";
+export { transformPageContent } from './data/transformPageContent';
+export { createReadableContent } from './data/createReadableContent';
+export { sanitizeMeta } from './data/sanitizeMeta';
+export { transformPost, TransformPostType } from './data/transformPost';

package/server/models/blocks.d.ts

@@ -1,4 +1,4 @@
-import { ReactElement } from 'react';
+import * as React from 'react';
 import { ContentBlockProps, FormBlockData, HeaderBlockProps, MediaProps as PCMediaProps, TextTheme } from '@gravity-ui/page-constructor';
 import { BlockType, ClassNameProps, PostData, QAProps } from './common';
 import { PaddingsYFMProps } from './paddings';
@@ -25,7 +25,7 @@ export type HeaderProps = HeaderBlockProps & PaddingsYFMProps;
 export type LayoutProps = {
     fullWidth?: boolean;
     mobileOrder?: string;
-    children: ReactElement[];
+    children: React.ReactElement[];
 } & PaddingsYFMProps;
 export type MediaProps = ClassNameProps & PaddingsYFMProps & Partial<Pick<PCMediaProps, 'youtube' | 'previewImg' | 'image' | 'video' | 'dataLens'>> & {
     text?: string;

package/server/models/blocks.js

@@ -1,2 +1,2 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", { value: true });

package/server/models/common.d.ts

@@ -1,4 +1,4 @@
-import { ReactNode } from 'react';
+import * as React from 'react';
 import { MarkdownItPluginCb } from '@diplodoc/transform/lib/plugins/typings';
 import { HeaderBlockProps as PageConstructorHeaderBlockProps } from '@gravity-ui/page-constructor';
 import { IBrowser, IDevice } from 'ua-parser-js';
@@ -136,7 +136,7 @@ export type ToggleLikeCallbackType = ({ postId, hasLike, }: {
 export interface HeaderBlockProps extends PageConstructorHeaderBlockProps {
     backLink?: {
         url: string;
-        title: ReactNode;
+        title: React.ReactNode;
     };
 }
 export type GetPostsRequest = {

package/server/models/common.js

@@ -5,7 +5,7 @@ var Theme;
 (function (Theme) {
     Theme["Light"] = "light";
     Theme["Dark"] = "dark";
-})(Theme = exports.Theme || (exports.Theme = {}));
+})(Theme || (exports.Theme = Theme = {}));
 var BlockType;
 (function (BlockType) {
     BlockType["Header"] = "blog-header-block";
@@ -20,7 +20,7 @@ var BlockType;
     BlockType["Meta"] = "blog-meta-block";
     BlockType["Feed"] = "blog-feed-block";
     BlockType["Form"] = "blog-form-block";
-})(BlockType = exports.BlockType || (exports.BlockType = {}));
+})(BlockType || (exports.BlockType = BlockType = {}));
 var DefaultEventNames;
 (function (DefaultEventNames) {
     DefaultEventNames["ShareButton"] = "share-button-click";
@@ -32,14 +32,14 @@ var DefaultEventNames;
     DefaultEventNames["Tag"] = "selector-tag-click";
     DefaultEventNames["Service"] = "selector-service-click";
     DefaultEventNames["SaveOnly"] = "save-only-button-click";
-})(DefaultEventNames = exports.DefaultEventNames || (exports.DefaultEventNames = {}));
+})(DefaultEventNames || (exports.DefaultEventNames = DefaultEventNames = {}));
 var PostCardSize;
 (function (PostCardSize) {
     PostCardSize["SMALL"] = "s";
     PostCardSize["MEDIUM"] = "m";
-})(PostCardSize = exports.PostCardSize || (exports.PostCardSize = {}));
+})(PostCardSize || (exports.PostCardSize = PostCardSize = {}));
 var PostCardTitleHeadingLevel;
 (function (PostCardTitleHeadingLevel) {
     PostCardTitleHeadingLevel["H2"] = "h2";
     PostCardTitleHeadingLevel["H3"] = "h3";
-})(PostCardTitleHeadingLevel = exports.PostCardTitleHeadingLevel || (exports.PostCardTitleHeadingLevel = {}));
+})(PostCardTitleHeadingLevel || (exports.PostCardTitleHeadingLevel = PostCardTitleHeadingLevel = {}));

package/server/models/locale.js

@@ -6,4 +6,4 @@ var Currency;
     Currency["RUB"] = "RUB";
     Currency["USD"] = "USD";
     Currency["KZT"] = "KZT";
-})(Currency = exports.Currency || (exports.Currency = {}));
+})(Currency || (exports.Currency = Currency = {}));

package/server/models/paddings.js

@@ -7,4 +7,4 @@ var PaddingsDirections;
     PaddingsDirections["bottom"] = "bottom";
     PaddingsDirections["left"] = "left";
     PaddingsDirections["right"] = "right";
-})(PaddingsDirections = exports.PaddingsDirections || (exports.PaddingsDirections = {}));
+})(PaddingsDirections || (exports.PaddingsDirections = PaddingsDirections = {}));

package/styles/storybook/common.scss

@@ -41,3 +41,10 @@
         min-height: auto;
     }
 }
+
+.g-root:not(.g-root_mobile) {
+    scrollbar-width: var(--g-scrollbar-width);
+    scrollbar-color: var(--g-color-scroll-handle) var(--g-color-scroll-track);
+
+    @include scrollbar;
+}

package/styles/styles.css

@@ -112,14 +112,6 @@ unpredictable css rules order in build */
 .yfm_blog .yfm-clipboard {
   margin: 32px 0;
 }
-.yfm_blog .yfm_reset_paddings > h1,
-.yfm_blog .yfm_reset_paddings > h2,
-.yfm_blog .yfm_reset_paddings > h3,
-.yfm_blog .yfm_reset_paddings > h4,
-.yfm_blog .yfm_reset_paddings > h5,
-.yfm_blog .yfm_reset_paddings > h6 {
-  margin-top: 0;
-}
 
 .yfm_blog_card p {
   color: var(--pc-text-header-color);

package/styles/yfm.css

@@ -111,14 +111,6 @@ unpredictable css rules order in build */
 .yfm_blog .yfm-clipboard {
   margin: 32px 0;
 }
-.yfm_blog .yfm_reset_paddings > h1,
-.yfm_blog .yfm_reset_paddings > h2,
-.yfm_blog .yfm_reset_paddings > h3,
-.yfm_blog .yfm_reset_paddings > h4,
-.yfm_blog .yfm_reset_paddings > h5,
-.yfm_blog .yfm_reset_paddings > h6 {
-  margin-top: 0;
-}
 
 .yfm_blog_card p {
   color: var(--pc-text-header-color);

package/styles/yfm.scss

@@ -130,15 +130,6 @@
     .yfm-clipboard {
         margin: $indentM 0;
     }
-
-    .yfm_reset_paddings > h1,
-    .yfm_reset_paddings > h2,
-    .yfm_reset_paddings > h3,
-    .yfm_reset_paddings > h4,
-    .yfm_reset_paddings > h5,
-    .yfm_reset_paddings > h6 {
-        margin-top: 0;
-    }
 }
 
 .yfm_blog_card {