Revert "fix: sync libs and docs versions (#136)"

This reverts commit ce1c14a.

.github/workflows/ci.yml

@@ -21,8 +21,6 @@ jobs:
       run: npm ci
     - name: Shape libs-data.json
       run: npm run fetch-data
-    - name: Shape packages-versions.json
-      run: npm run get-packages-versions
     - name: Lint Files
       run: npm run lint
     - name: Typecheck

.github/workflows/deploy.yml

@@ -29,6 +29,8 @@ jobs:
         run: npm run build && npm run export
         env:
           GITHUB_TOKEN: ${{ github.token }}
+          UIKIT_TARGET_BRANCH: 'main'
+          DATE_COMPONENTS_TARGET_BRANCH: 'main'
       # Deploy
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3

.gitignore

@@ -27,6 +27,5 @@ yarn-debug.log*
 yarn-error.log*
 
 /src/libs-data.json
-/src/packages-versions.json
 
 .env

README.md

@@ -14,5 +14,11 @@ npm run start
 ```bash
 # .env file
 
+UIKIT_TARGET_BRANCH="your-branch" # default main, target branch for pulling documentation from uikit
+
+COMPONENTS_TARGET_BRANCH="your-branch" # default main, target branch for pulling documentation from components
+
+DATE_COMPONENTS_TARGET_BRANCH="your-branch" # default main, target branch for pulling documentation from date-components
+
 GITHUB_PROFILE="your profile" # default gravity-ui, target profile for pulling documentation from components
 ```

next.config.js

@@ -70,6 +70,11 @@ const plugins = [
 module.exports = withPlugins(plugins, {
     reactStrictMode: true,
     output: 'export',
+    env: {
+        UIKIT_TARGET_BRANCH: process.env.UIKIT_TARGET_BRANCH,
+        COMPONENTS_TARGET_BRANCH: process.env.COMPONENTS_TARGET_BRANCH,
+        DATE_COMPONENTS_TARGET_BRANCH: process.env.DATE_COMPONENTS_TARGET_BRANCH,
+    },
     experimental: {
         esmExternals: 'loose',
     },

package.json

@@ -4,11 +4,11 @@
   "private": true,
   "homepage": "https://gravity-ui.com/",
   "dependencies": {
-    "@doc-tools/transform": "^3.11.0",
-    "@gravity-ui/components": "2.1.0",
-    "@gravity-ui/icons": "^2.8.1",
-    "@gravity-ui/page-constructor": "^4.41.0",
-    "@gravity-ui/uikit": "5.12.1",
+    "@doc-tools/transform": "^2.16.0",
+    "@gravity-ui/components": "^2.1.0",
+    "@gravity-ui/icons": "^2.3.0",
+    "@gravity-ui/page-constructor": "^3.9.2",
+    "@gravity-ui/uikit": "^5.12.1",
     "@mdx-js/mdx": "^2.3.0",
     "@mdx-js/react": "^2.3.0",
     "@testing-library/jest-dom": "^5.16.5",
@@ -63,19 +63,18 @@
   },
   "overrides": {
     "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react-dom": "^17.0.2",
+    "@gravity-ui/uikit": "^5.12.1"
   },
   "scripts": {
     "prepare": "husky install",
     "start": "next dev",
     "build": "next build",
     "export": "next export -o build/",
     "fetch-data": "node ./scripts/prefetch-data.mjs",
-    "get-packages-versions": "node ./scripts/get-packages-versions.mjs",
-    "prepare-metadata": "npm run fetch-data && npm run get-packages-versions",
-    "prestart": "npm run prepare-metadata",
-    "prebuild": "npm run prepare-metadata",
-    "pretest": "npm run prepare-metadata",
+    "prestart": "npm run fetch-data",
+    "prebuild": "npm run fetch-data",
+    "pretest": "npm run fetch-data",
     "lint:js": "eslint --ext .js,.jsx,.ts,.tsx .",
     "lint:styles": "stylelint '{styles,src}/**/*.scss'",
     "lint:prettier": "prettier --check '**/*.md'",

src/blocks/CustomHeader/CustomHeader.scss

@@ -5,12 +5,6 @@
 $block: '.#{variables.$ns}custom-header';
 
 #{$block} {
-    margin-top: 76px;
-
-    @media (max-width: map-get(pcVariables.$gridBreakpoints, 'sm') - 1) {
-        margin-top: 32px;
-    }
-
     &__title {
         @include pcStyles.heading1();
         max-width: 800px;

src/components/Landing/Landing.scss

@@ -0,0 +1,8 @@
+@use '~@gravity-ui/page-constructor/styles/variables.scss' as pcVariables;
+@use '../../variables.scss';
+
+$block: '.#{variables.$ns}landing';
+
+#{$block} {
+    margin-top: -20px;
+}

src/components/Landing/Landing.tsx

@@ -9,22 +9,29 @@ import {RoadmapBlock} from '../../blocks/RoadmapBlock/RoadmapBlock';
 import {CustomBlock} from '../../blocks/constants';
 import {landing} from '../../content/landing';
 import {useSectionScroll} from '../../hooks/useSectionScroll';
+import {block} from '../../utils';
+
+import './Landing.scss';
+
+const b = block('landing');
 
 export const Landing: React.FC = () => {
     useSectionScroll();
 
     return (
-        <PageConstructor
-            content={landing}
-            custom={{
-                blocks: {
-                    [CustomBlock.CustomHeader]: CustomHeader,
-                    [CustomBlock.CustomExtendedFeatures]: CustomExtendedFeatures,
-                    [CustomBlock.CustomBanner]: CustomBanner,
-                    [CustomBlock.Examples]: Examples,
-                    [CustomBlock.Roadmap]: RoadmapBlock,
-                },
-            }}
-        />
+        <div className={b()}>
+            <PageConstructor
+                content={landing}
+                custom={{
+                    blocks: {
+                        [CustomBlock.CustomHeader]: CustomHeader,
+                        [CustomBlock.CustomExtendedFeatures]: CustomExtendedFeatures,
+                        [CustomBlock.CustomBanner]: CustomBanner,
+                        [CustomBlock.Examples]: Examples,
+                        [CustomBlock.Roadmap]: RoadmapBlock,
+                    },
+                }}
+            />
+        </div>
     );
 };

src/constants.ts

@@ -5,4 +5,6 @@ export const GA_ID = 'GTM-KHT6KD7';
 export const MENU_ID = 'menu';
 export const CONTENT_WRAPPER_ID = 'content';
 
+export const TARGET_BRANCH = 'main';
+
 export const TARGET_PROFILE = 'gravity-ui';

src/content/components/utils.ts

@@ -1,13 +1,15 @@
-import {TARGET_PROFILE} from '../../constants';
-import packagesVersions from '../../packages-versions.json';
+import {TARGET_BRANCH, TARGET_PROFILE} from '../../constants';
 import {Repos} from '../../types/common';
 
-const githubTargetProfile = process.env.GITHUB_PROFILE || TARGET_PROFILE;
+const uikitTargetBranch = process.env.UIKIT_TARGET_BRANCH || TARGET_BRANCH;
+const componentsTargetBranch = process.env.COMPONENTS_TARGET_BRANCH || TARGET_BRANCH;
+const dateComponentsTargetBranch = process.env.DATE_COMPONENTS_TARGET_BRANCH || TARGET_BRANCH;
+const githubTargetprofile = process.env.GITHUB_PROFILE || TARGET_PROFILE;
 
-const TARGET_REPOS_VERSIONS = {
-    [Repos.Uikit]: packagesVersions[Repos.Uikit],
-    [Repos.Components]: packagesVersions[Repos.Components],
-    // [Repos.DateComponents]: packagesVersions['@gravity-ui/date-components'],
+const TARGET_REPOS_BRANCHES = {
+    [Repos.Uikit]: uikitTargetBranch,
+    [Repos.Components]: componentsTargetBranch,
+    [Repos.DateComponents]: dateComponentsTargetBranch,
 };
 
 export type GetterProps = {componentName: string; repoName: Repos};
@@ -21,7 +23,7 @@ export const mappingOptions = (arr: string[]) =>
     }));
 
 export const getReadmeUrl: RepoInfoGetterFunc = ({componentName, repoName}) =>
-    `https://raw.githubusercontent.com/${githubTargetProfile}/${repoName}/v${TARGET_REPOS_VERSIONS[repoName]}/src/components/${componentName}/README.md`;
+    `https://raw.githubusercontent.com/${githubTargetprofile}/${repoName}/${TARGET_REPOS_BRANCHES[repoName]}/src/components/${componentName}/README.md`;
 
 export const getGithubUrl: RepoInfoGetterFunc = ({componentName, repoName}) =>
-    `https://github.com/${githubTargetProfile}/${repoName}/tree/main/src/components/${componentName}`;
+    `https://github.com/${githubTargetprofile}/${repoName}/tree/main/src/components/${componentName}`;

src/styles.scss

@@ -36,18 +36,15 @@ body,
     height: 100%;
 }
 
-body.g-root,
-.g-root {
+body.g-root {
+    margin: 0;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+
     &_theme_dark {
         --g-color-base-background: #160d1b;
         background-color: var(--g-color-base-background);
     }
-}
-
-.g-root {
-    margin: 0;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
 
     &:not(.sandbox) {
         --g-font-family-sans: 'Inter', 'Helvetica Neue', 'Arial', 'Helvetica', sans-serif;
@@ -136,8 +133,4 @@ body.g-root,
             }
         }
     }
-
-    .pc-page-constructor {
-        background-color: transparent;
-    }
 }

src/types/common.ts

@@ -1,5 +1,5 @@
 export enum Repos {
     Uikit = 'uikit',
     Components = 'components',
-    // DateComponents = 'date-components',
+    DateComponents = 'date-components',
 }