fix: use cli in tests and return imports of yfm assets

diplodoc-platform · Nov 21, 2023 · c941916 · c941916
1 parent d5d9453
commit c941916
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 22 deletions.
diff --git a/__tests__/__image_snapshots__/index-test-ts-integration-works-5-snap.png b/__tests__/__image_snapshots__/index-test-ts-integration-works-5-snap.png
diff --git a/__tests__/index.test.ts b/__tests__/index.test.ts
@@ -1,12 +1,11 @@
-import {dirname, join, resolve} from 'path';
+import {resolve} from 'path';
+import {execSync} from 'child_process';
 
 import {toMatchImageSnapshot} from 'jest-image-snapshot';
 import {fromPath} from 'pdf2pic';
 import puppeteer from 'puppeteer';
 import {Browser} from 'puppeteer-core';
 
-import {generatePdf} from '../src';
-
 expect.extend({toMatchImageSnapshot});
 
 describe('integration', () => {
@@ -26,10 +25,7 @@ describe('integration', () => {
         // @ts-ignore
         browser = await puppeteer.launch({headless: true});
 
-        await generatePdf({
-            singlePagePath: join(dirname(pdfFile), 'single-page.json'),
-            browser,
-        });
+        execSync('node build/cmd/index.js -i integration-output');
     });
 
     it('works', async () => {

diff --git a/package.json b/package.json
@@ -17,11 +17,10 @@
   ],
   "scripts": {
     "build": "webpack",
-    "start": "node build/index.js",
     "lint:js": "eslint --ext .js,.jsx,.ts,.tsx .",
     "lint": "npm run lint:js",
     "binary": "pkg .",
-    "test": "npm run integration:prepare && jest",
+    "test": "npm run build && npm run integration:prepare && jest",
     "integration:clean": "rm -rf ./integration-output",
     "integration:build": "npx -y --legacy-peer-deps -- @diplodoc/cli -i ./integration -o ./integration-output --single-page",
     "integration:prepare": "npm run integration:clean && npm run integration:build"

diff --git a/src/generate/utils.ts b/src/generate/utils.ts
@@ -1,21 +1,17 @@
-import {readFileSync} from 'fs';
 import {join} from 'path';
 
 import {SINGLE_PAGE_DATA_FILENAME} from './constants';
 
-export function generatePdfStaticMarkup(html: string) {
-    const yfmStylesPath = require.resolve('@diplodoc/transform/dist/css/yfm.css');
-    const yfmStyles = readFileSync(yfmStylesPath, 'utf-8');
-
-    const yfmPrintStylesPath = require.resolve('@diplodoc/transform/dist/css/print.css');
-    const yfmPrintStyles = readFileSync(yfmPrintStylesPath, 'utf-8');
-
-    const yfmPrintJSPath = require.resolve('@diplodoc/transform/dist/js/print.js');
-    const yfmPrintJS = readFileSync(yfmPrintJSPath, 'utf-8');
-
-    const yfmJSPath = require.resolve('@diplodoc/transform/dist/js/yfm.js');
-    const yfmJS = readFileSync(yfmJSPath, 'utf-8');
+// @ts-ignore
+import yfmStyles from '@diplodoc/transform/dist/css/yfm.css';
+// @ts-ignore
+import yfmPrintStyles from '@diplodoc/transform/dist/css/print.css';
+// @ts-ignore
+import yfmPrintJS from '@diplodoc/transform/dist/js/print.js';
+// @ts-ignore
+import yfmJS from '@diplodoc/transform/dist/js/yfm.js';
 
+export function generatePdfStaticMarkup(html: string) {
     return `
 <!doctype html>
 <html>