@allurereport/plugin-dashboard 3.15.0 → 3.16.1

package/dist/generators.d.ts

@@ -2,7 +2,7 @@ import type { TestResult } from "@allurereport/core-api";
 import { type AllureStore, type PluginContext, type ReportFiles } from "@allurereport/plugin-api";
 import type { DashboardOptions, DashboardPluginOptions, TemplateManifest } from "./model.js";
 import type { DashboardDataWriter, ReportFile } from "./writer.js";
-export declare const readTemplateManifest: (singleFileMode?: boolean) => Promise<TemplateManifest>;
+export declare const readTemplateManifest: (_singleFileMode?: boolean) => Promise<TemplateManifest>;
 export declare const generateAllCharts: (writer: DashboardDataWriter, store: AllureStore, options: DashboardPluginOptions, context: PluginContext, filter?: (testResult: TestResult) => boolean) => Promise<void>;
 export declare const generateEnvirontmentsList: (writer: DashboardDataWriter, store: AllureStore) => Promise<void>;
 export declare const generateStaticFiles: (payload: DashboardOptions & {

package/dist/generators.js

@@ -1,12 +1,10 @@
 import { randomUUID } from "node:crypto";
-import { readFile } from "node:fs/promises";
-import { createRequire } from "node:module";
-import { basename, join } from "node:path";
 import { defaultChartsConfig } from "@allurereport/charts-api";
 import { createBaseUrlScript, createFontLinkTag, createReportDataScript, stringifyForInlineScript, createScriptTag, createStylesLinkTag, } from "@allurereport/core-api";
+import { copyReportStaticAssets, getReportStaticAsset, readReportStaticAssets, } from "@allurereport/plugin-api/static-assets";
 import { generateCharts } from "@allurereport/web-commons";
 import Handlebars from "handlebars";
-const require = createRequire(import.meta.url);
+const reportStaticArchive = new URL("../dist/static/report.tar", import.meta.url);
 const template = `<!DOCTYPE html>
 <html dir="ltr" lang="en">
 <head>
@@ -43,10 +41,9 @@ const template = `<!DOCTYPE html>
 </body>
 </html>
 `;
-export const readTemplateManifest = async (singleFileMode) => {
-    const templateManifestSource = require.resolve(`@allurereport/web-dashboard/dist/${singleFileMode ? "single" : "multi"}/manifest.json`);
-    const templateManifest = await readFile(templateManifestSource, { encoding: "utf-8" });
-    return JSON.parse(templateManifest);
+export const readTemplateManifest = async (_singleFileMode) => {
+    const { manifest } = await readReportStaticAssets(reportStaticArchive);
+    return manifest;
 };
 export const generateAllCharts = async (writer, store, options, context, filter) => {
     const { layout = defaultChartsConfig } = options;
@@ -60,15 +57,15 @@ export const generateEnvirontmentsList = async (writer, store) => {
     await writer.writeWidget("environments.json", environments);
 };
 export const generateStaticFiles = async (payload) => {
-    const { reportName = "Allure Report", reportLanguage = "en", singleFile, logo = "", theme = "light", reportFiles, reportDataFiles, reportUuid, allureVersion, } = payload;
+    const { reportName = "Allure Report", reportLanguage = "en", logo = "", theme = "light", reportFiles, reportDataFiles, reportUuid, allureVersion, } = payload;
     const compile = Handlebars.compile(template);
-    const manifest = await readTemplateManifest(payload.singleFile);
+    const staticAssets = await readReportStaticAssets(reportStaticArchive);
+    const { manifest } = staticAssets;
     const headTags = [];
     const bodyTags = [];
     if (!payload.singleFile) {
         for (const key in manifest) {
             const fileName = manifest[key];
-            const filePath = require.resolve(join("@allurereport/web-dashboard/dist", singleFile ? "single" : "multi", fileName));
             if (key.includes(".woff")) {
                 headTags.push(createFontLinkTag(fileName));
             }
@@ -78,17 +75,17 @@ export const generateStaticFiles = async (payload) => {
             if (key === "main.js") {
                 bodyTags.push(createScriptTag(fileName));
             }
-            if (singleFile) {
-                continue;
-            }
-            const fileContent = await readFile(filePath);
-            await reportFiles.addFile(basename(filePath), fileContent);
         }
+        await copyReportStaticAssets(staticAssets, reportFiles);
     }
     else {
         const mainJs = manifest["main.js"];
-        const mainJsSource = require.resolve(`@allurereport/web-dashboard/dist/single/${mainJs}`);
-        const mainJsContentBuffer = await readFile(mainJsSource);
+        const mainCss = manifest["main.css"];
+        if (mainCss) {
+            const mainCssContent = getReportStaticAsset(staticAssets, mainCss);
+            headTags.push(createStylesLinkTag(`data:text/css;base64,${mainCssContent.toString("base64")}`));
+        }
+        const mainJsContentBuffer = getReportStaticAsset(staticAssets, mainJs);
         bodyTags.push(createScriptTag(`data:text/javascript;base64,${mainJsContentBuffer.toString("base64")}`));
     }
     const reportOptions = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-dashboard",
-  "version": "3.15.0",
+  "version": "3.16.1",
   "description": "Allure Dashboard Plugin – plugin for generating dashboard with a mix of charts",
   "keywords": [
     "allure",
@@ -25,22 +25,22 @@
     ".": "./dist/index.js"
   },
   "scripts": {
-    "build": "run clean && tsc --project ./tsconfig.json",
+    "build": "run clean && tsc --project ./tsconfig.json && node ../../scripts/pack-report-static.mjs ../web-dashboard/dist/multi ./dist/static/report.tar",
     "clean": "rimraf ./dist",
     "test": "rimraf ./out && vitest run",
     "lint": "oxlint --import-plugin src test features stories",
     "lint:fix": "oxlint --import-plugin --fix src test features stories"
   },
   "dependencies": {
-    "@allurereport/charts-api": "3.15.0",
-    "@allurereport/core-api": "3.15.0",
-    "@allurereport/plugin-api": "3.15.0",
-    "@allurereport/web-commons": "3.15.0",
-    "@allurereport/web-dashboard": "3.15.0",
+    "@allurereport/charts-api": "3.16.1",
+    "@allurereport/core-api": "3.16.1",
+    "@allurereport/plugin-api": "3.16.1",
+    "@allurereport/web-commons": "3.16.1",
     "d3-shape": "^3.2.0",
     "handlebars": "^4.7.9"
   },
   "devDependencies": {
+    "@allurereport/web-dashboard": "3.16.1",
     "@types/d3-shape": "^3.1.8",
     "@types/node": "^20",
     "@vitest/runner": "^2",