@diplodoc/cli 4.6.0-alpha-1 → 4.6.0-alpha-3

package/package.json

@@ -3,7 +3,7 @@
   "author": "Yandex Data UI Team <data-ui@yandex-team.ru>",
   "description": "Make documentation using yfm-docs in Markdown and HTML formats",
   "license": "MIT",
-  "version": "4.6.0-alpha-1",
+  "version": "4.6.0-alpha-3",
   "repository": {
     "type": "git",
     "url": "git@github.com:diplodoc-platform/cli.git"
@@ -107,16 +107,11 @@
   },
   "pkg": {
     "scripts": [
-      "build/index.js",
-      "build/linter.js",
-      "build/plugins/*.js",
-      "build/lint-rules/*.js",
-      "build/default-lint-config.js",
-      "build/head-content.js"
+      "./build/*.js",
+      "./build/**/*.js"
     ],
     "assets": [
-      "build/app.client.js",
-      "build/app.client.css"
+      "./assets/*"
     ]
   },
   "keywords": [

package/src/constants.ts

@@ -1,4 +1,4 @@
-import {dirname} from 'path';
+import {resolve} from 'path';
 const os = require('os');
 const notes = require('@diplodoc/transform/lib/plugins/notes');
 const anchors = require('@diplodoc/transform/lib/plugins/anchors');
@@ -24,10 +24,8 @@ includes.collect = require('@diplodoc/transform/lib/plugins/includes/collect');
 images.collect = require('@diplodoc/transform/lib/plugins/images/collect');
 changelog.collect = require('@diplodoc/transform/lib/plugins/changelog/collect');
 
-export const BUILD_FOLDER = 'build';
+export const ASSETS_FOLDER = resolve(__dirname, '..', 'assets');
 export const BUNDLE_FOLDER = '_bundle';
-export const BUNDLE_JS_FILENAME = 'app.client.js';
-export const BUNDLE_CSS_FILENAME = 'app.client.css';
 export const TMP_INPUT_FOLDER = '.tmp_input';
 export const TMP_OUTPUT_FOLDER = '.tmp_output';
 export const MAIN_TIMER_ID = 'Build time';
@@ -67,8 +65,6 @@ export enum ResourceType {
     script = 'script',
 }
 
-export const BUILD_FOLDER_PATH = dirname(require.resolve('@diplodoc/client'));
-
 export const YFM_PLUGINS = [
     meta,
     deflist,

package/src/steps/processAssets.ts

@@ -1,10 +1,11 @@
 import walkSync from 'walk-sync';
 import shell from 'shelljs';
 
-import client from '../../scripts/client';
 import {ArgvService} from '../services';
 import {copyFiles} from '../utils';
 
+import {ASSETS_FOLDER} from '../constants';
+
 /**
  * Processes assets files (everything except .yaml and .md files)
  * @param {string} outputBundlePath
@@ -23,8 +24,5 @@ export function processAssets(outputBundlePath: string) {
 
     /* Copy js bundle to user' output folder */
     shell.mkdir('-p', outputBundlePath);
-
-    for (const [, path] of client.assets) {
-        shell.cp(path, outputBundlePath);
-    }
+    shell.cp(ASSETS_FOLDER + '/*', outputBundlePath);
 }

package/src/utils/markup.ts

@@ -1,3 +1,4 @@
+import {join} from 'path';
 import {platform} from 'process';
 
 import {CUSTOM_STYLE, Platforms, ResourceType} from '../constants';
@@ -5,7 +6,10 @@ import {Resources, SinglePageResult} from '../models';
 import {ArgvService, PluginService} from '../services';
 import {preprocessPageHtmlForSinglePage} from './singlePage';
 import {DocInnerProps, DocPageData, render} from '@diplodoc/client';
-import client from '../../scripts/client';
+
+import manifest from '@diplodoc/client/manifest';
+
+const dst = (bundlePath: string) => (target: string) => join(bundlePath, target);
 
 export interface TitleMeta {
     title?: string;
@@ -44,8 +48,8 @@ export function generateStaticMarkup(
                         height: 100vh;
                     }
                 </style>
-                ${client.bundle
-                    .css(pathToBundle)
+                ${manifest.css
+                    .map(dst(pathToBundle))
                     .map((src: string) => `<link type="text/css" rel="stylesheet" href="${src}" />`)
                     .join('\n')}
                 ${PluginService.getHeadContent()}
@@ -57,8 +61,8 @@ export function generateStaticMarkup(
                    window.STATIC_CONTENT = ${staticContent}
                    window.__DATA__ = ${JSON.stringify(props)};
                 </script>
-                ${client.bundle
-                    .js(pathToBundle)
+                ${manifest.js
+                    .map(dst(pathToBundle))
                     .map(
                         (src: string) =>
                             `<script type="application/javascript" src="${src}"></script>`,