@allurereport/plugin-awesome 3.16.0 → 3.16.1

package/dist/categories.d.ts

@@ -1,9 +1,9 @@
 import type { CategoryDefinition } from "@allurereport/core-api";
-import type { AwesomeTestResult } from "@allurereport/web-awesome";
+import { type ReportTestResult } from "@allurereport/plugin-api";
 import type { AwesomeDataWriter } from "./writer.js";
-export declare const applyCategoriesToTestResults: (tests: AwesomeTestResult[], categories: CategoryDefinition[]) => void;
+export declare const applyCategoriesToTestResults: (tests: ReportTestResult[], categories: CategoryDefinition[]) => void;
 export declare const generateCategories: (writer: AwesomeDataWriter, { tests, categories, filename, environmentCount, selectedEnvironmentCount, environments, defaultEnvironment, }: {
-    tests: AwesomeTestResult[];
+    tests: ReportTestResult[];
     categories: CategoryDefinition[];
     filename?: string;
     environmentCount?: number;

package/dist/converters.d.ts

@@ -1,7 +1,7 @@
 import { type TestFixtureResult, type TestResult, type TestStepResult } from "@allurereport/core-api";
-import type { AwesomeFixtureResult, AwesomeTestResult, AwesomeTestStepResult } from "@allurereport/web-awesome";
+import type { ReportFixtureResult, ReportTestResult, ReportTestStepResult } from "@allurereport/plugin-api";
 export declare const convertTestResult: (tr: TestResult, options?: {
     hideLabels?: readonly (string | RegExp)[];
-}) => AwesomeTestResult;
-export declare const convertTestStepResult: (tsr: TestStepResult) => AwesomeTestStepResult;
-export declare const convertFixtureResult: (fr: TestFixtureResult) => AwesomeFixtureResult;
+}) => ReportTestResult;
+export declare const convertTestStepResult: (tsr: TestStepResult) => ReportTestStepResult;
+export declare const convertFixtureResult: (fr: TestFixtureResult) => ReportFixtureResult;

package/dist/converters.js

@@ -24,7 +24,6 @@ export const convertTestResult = (tr, options = {}) => {
         historyId: tr.historyId,
         flaky: tr.flaky,
         muted: tr.muted,
-        known: tr.known,
         isRetry: tr.isRetry,
         labels,
         groupedLabels: mapLabelsByName(labels),
@@ -33,6 +32,7 @@ export const convertTestResult = (tr, options = {}) => {
         steps: (tr.steps ?? []).map(convertTestStepResult),
         error: tr.error,
         testCase: tr.testCase,
+        retryHash: tr.retryHash,
         descriptionHtml: tr.descriptionHtml ?? markdownToHtml(tr.description),
         environment: tr.environment,
         setup: [],

package/dist/generators.d.ts

@@ -1,18 +1,17 @@
 import { type AttachmentLink, type EnvironmentIdentity, type EnvironmentItem, type Statistic, type TestEnvGroup, type TestResult } from "@allurereport/core-api";
-import type { AllureStore, GlobalAttachmentLink, ExitCode, PluginContext, PluginGlobalError, QualityGateValidationResult, ReportFiles, ResultFile } from "@allurereport/plugin-api";
-import type { AwesomeExecutorInfo, AwesomeRunSummary, AwesomeTestResult } from "@allurereport/web-awesome";
+import type { AllureStore, ReportExecutorInfo, ReportRunSummary, ReportTestResult, GlobalAttachmentLink, ExitCode, PluginContext, PluginGlobalError, QualityGateValidationResult, ReportFiles, ResultFile } from "@allurereport/plugin-api";
 import type { AwesomeOptions, TemplateManifest } from "./model.js";
 import type { AwesomeDataWriter, ReportFile } from "./writer.js";
-export declare const readTemplateManifest: (singleFileMode?: boolean) => Promise<TemplateManifest>;
+export declare const readTemplateManifest: (_singleFileMode?: boolean) => Promise<TemplateManifest>;
 export declare const generateTestResults: (_writer: AwesomeDataWriter, store: AllureStore, trs: TestResult[], options?: {
     hideLabels?: readonly (string | RegExp)[];
-}) => Promise<AwesomeTestResult[]>;
-export declare const generateTestCases: (writer: AwesomeDataWriter, trs: AwesomeTestResult[]) => Promise<void>;
+}) => Promise<ReportTestResult[]>;
+export declare const generateTestCases: (writer: AwesomeDataWriter, trs: ReportTestResult[]) => Promise<void>;
 export declare const generateTestEnvGroups: (writer: AwesomeDataWriter, groups: TestEnvGroup[]) => Promise<void>;
-export declare const generateNav: (writer: AwesomeDataWriter, trs: AwesomeTestResult[], filename?: string) => Promise<void>;
-export declare const generateSearchIndex: (writer: AwesomeDataWriter, trs: AwesomeTestResult[], filename?: string) => Promise<void>;
-export declare const getRunSummary: (testResults: Pick<TestResult, "start" | "stop">[]) => AwesomeRunSummary | undefined;
-export declare const generateTree: (writer: AwesomeDataWriter, treeFilename: string, labels: string[], tests: AwesomeTestResult[], options?: {
+export declare const generateNav: (writer: AwesomeDataWriter, trs: ReportTestResult[], filename?: string) => Promise<void>;
+export declare const generateSearchIndex: (writer: AwesomeDataWriter, trs: ReportTestResult[], filename?: string) => Promise<void>;
+export declare const getRunSummary: (testResults: Pick<TestResult, "start" | "stop">[]) => ReportRunSummary | undefined;
+export declare const generateTree: (writer: AwesomeDataWriter, treeFilename: string, labels: string[], tests: ReportTestResult[], options?: {
     appendTitlePath?: boolean;
 }) => Promise<void>;
 export declare const generateEnvironmentJson: (writer: AwesomeDataWriter, env: EnvironmentItem[]) => Promise<void>;
@@ -34,7 +33,7 @@ export declare const generateGlobals: (writer: AwesomeDataWriter, payload: {
     contentFunction: (id: string) => Promise<ResultFile | undefined>;
 }) => Promise<void>;
 export declare const generateQualityGateResults: (writer: AwesomeDataWriter, qualityGateResults?: Record<string, QualityGateValidationResult[]>, options?: {
-    tests?: AwesomeTestResult[];
+    tests?: ReportTestResult[];
     labels?: string[];
     appendTitlePath?: boolean;
 }) => Promise<void>;
@@ -45,8 +44,8 @@ export declare const generateStaticFiles: (payload: AwesomeOptions & {
     reportDataFiles: ReportFile[];
     reportUuid: string;
     reportName: string;
-    executor?: AwesomeExecutorInfo;
-    runSummary?: AwesomeRunSummary;
+    executor?: ReportExecutorInfo;
+    runSummary?: ReportRunSummary;
 }) => Promise<void>;
 export declare const generateAllCharts: (writer: AwesomeDataWriter, store: AllureStore, options: AwesomeOptions, context: PluginContext) => Promise<void>;
-export declare const generateTreeFilters: (writer: AwesomeDataWriter, testResults: AwesomeTestResult[]) => Promise<void>;
+export declare const generateTreeFilters: (writer: AwesomeDataWriter, testResults: ReportTestResult[]) => Promise<void>;

package/dist/generators.js

@@ -1,14 +1,12 @@
 import { randomUUID } from "node:crypto";
-import { readFile, readdir } from "node:fs/promises";
-import { createRequire } from "node:module";
-import { basename, dirname, join } from "node:path";
 import { defaultChartsConfig } from "@allurereport/charts-api";
 import { appLoaderFaviconDataUri, appLoaderStyles, compareBy, createAppLoaderMarkup, createBaseUrlScript, createFaviconLinkTag, createFontLinkTag, createReportDataScript, stringifyForInlineScript, createScriptTag, createStylesLinkTag, incrementStatistic, joinPosixPath, nullsLast, ordinal, } from "@allurereport/core-api";
 import { collapseTreeGroups, createTreeByLabels, createTreeByLabelsAndTitlePath, createTreeByTitlePath, preciseTreeLabels, processTree, } from "@allurereport/plugin-api";
+import { copyReportStaticAssets, getReportStaticAsset, readReportStaticAssets, } from "@allurereport/plugin-api/static-assets";
 import { generateCharts, getPieChartValues } from "@allurereport/web-commons";
 import Handlebars from "handlebars";
 import { convertFixtureResult, convertTestResult } from "./converters.js";
-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>
@@ -48,10 +46,9 @@ const template = `<!DOCTYPE html>
 </html>
 `;
 const compiledTemplate = Handlebars.compile(template);
-export const readTemplateManifest = async (singleFileMode) => {
-    const templateManifestSource = require.resolve(`@allurereport/web-awesome/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;
 };
 const createBreadcrumbs = (convertedTr) => {
     const labelsByType = convertedTr.labels.reduce((acc, label) => {
@@ -400,14 +397,13 @@ export const generateQualityGateResults = async (writer, qualityGateResults = {}
     await writer.writeWidget("quality-gate.json", resultsWithTrees);
 };
 export const generateStaticFiles = async (payload) => {
-    const { id, reportName = "Allure Report", reportLanguage = "en", singleFile, logo = "", theme = "auto", groupBy, reportFiles, reportDataFiles, reportUuid, allureVersion, layout = "base", defaultSection = "", ci, executor, runSummary, stepTreeExpansion, defaultSortBy, } = payload;
-    const manifest = await readTemplateManifest(payload.singleFile);
+    const { id, reportName = "Allure Report", reportLanguage = "en", logo = "", theme = "auto", groupBy, reportFiles, reportDataFiles, reportUuid, allureVersion, layout = "base", defaultSection = "", ci, executor, runSummary, stepTreeExpansion, defaultSortBy, } = payload;
+    const staticAssets = await readReportStaticAssets(reportStaticArchive);
+    const { manifest } = staticAssets;
     const headTags = [];
     const bodyTags = [];
     const sections = ["charts", "timeline"];
     if (!payload.singleFile) {
-        const manifestPath = require.resolve(join("@allurereport/web-awesome/dist", singleFile ? "single" : "multi", "manifest.json"));
-        const templateDir = dirname(manifestPath);
         for (const key in manifest) {
             const fileName = manifest[key];
             if (key.includes(".woff")) {
@@ -420,19 +416,16 @@ export const generateStaticFiles = async (payload) => {
                 bodyTags.push(createScriptTag(fileName));
             }
         }
-        for (const fileName of await readdir(templateDir)) {
-            if (fileName === "manifest.json") {
-                continue;
-            }
-            const filePath = join(templateDir, fileName);
-            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-awesome/dist/single/${mainJs}`);
-        const mainJsContent = 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 mainJsContent = getReportStaticAsset(staticAssets, mainJs);
         bodyTags.push(createScriptTag(`data:text/javascript;base64,${mainJsContent.toString("base64")}`));
     }
     const now = Date.now();

package/dist/model.d.ts

@@ -1,6 +1,6 @@
 import type { ChartOptions } from "@allurereport/charts-api";
 import type { CiDescriptor, EnvironmentsConfig, TestResult } from "@allurereport/core-api";
-import type { StepTreeExpansion } from "@allurereport/web-awesome";
+import type { StepTreeExpansion } from "@allurereport/plugin-api";
 export type AwesomeOptions = {
     reportName?: string;
     singleFile?: boolean;

package/dist/writer.d.ts

@@ -1,5 +1,4 @@
-import type { ReportFiles, ResultFile } from "@allurereport/plugin-api";
-import type { AwesomeTestResult } from "@allurereport/web-awesome";
+import type { ReportTestResult, ReportFiles, ResultFile } from "@allurereport/plugin-api";
 export interface ReportFile {
     name: string;
     value: string;
@@ -7,7 +6,7 @@ export interface ReportFile {
 export interface AwesomeDataWriter {
     writeData(fileName: string, data: any): Promise<void>;
     writeWidget(fileName: string, data: any): Promise<void>;
-    writeTestCase(test: AwesomeTestResult): Promise<void>;
+    writeTestCase(test: ReportTestResult): Promise<void>;
     writeAttachment(source: string, file: ResultFile): Promise<void>;
 }
 export declare class FileSystemReportDataWriter implements AwesomeDataWriter {
@@ -16,14 +15,14 @@ export declare class FileSystemReportDataWriter implements AwesomeDataWriter {
     constructor(output: string);
     writeData(fileName: string, data: any): Promise<void>;
     writeWidget(fileName: string, data: any): Promise<void>;
-    writeTestCase(test: AwesomeTestResult): Promise<void>;
+    writeTestCase(test: ReportTestResult): Promise<void>;
     writeAttachment(source: string, file: ResultFile): Promise<void>;
 }
 export declare class InMemoryReportDataWriter implements AwesomeDataWriter {
     #private;
     writeData(fileName: string, data: any): Promise<void>;
     writeWidget(fileName: string, data: any): Promise<void>;
-    writeTestCase(test: AwesomeTestResult): Promise<void>;
+    writeTestCase(test: ReportTestResult): Promise<void>;
     writeAttachment(fileName: string, file: ResultFile): Promise<void>;
     reportFiles(): ReportFile[];
 }
@@ -33,5 +32,5 @@ export declare class ReportFileDataWriter implements AwesomeDataWriter {
     writeData(fileName: string, data: any): Promise<void>;
     writeWidget(fileName: string, data: any): Promise<void>;
     writeAttachment(source: string, file: ResultFile): Promise<void>;
-    writeTestCase(test: AwesomeTestResult): Promise<void>;
+    writeTestCase(test: ReportTestResult): Promise<void>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-awesome",
-  "version": "3.16.0",
+  "version": "3.16.1",
   "description": "Allure Awesome Plugin – brand new HTML report with modern design and new features",
   "keywords": [
     "allure",
@@ -23,23 +23,23 @@
     ".": "./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-awesome/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.16.0",
-    "@allurereport/core-api": "3.16.0",
-    "@allurereport/plugin-api": "3.16.0",
-    "@allurereport/web-awesome": "3.16.0",
-    "@allurereport/web-commons": "3.16.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",
     "markdown-it": "^14.2.0"
   },
   "devDependencies": {
+    "@allurereport/web-awesome": "3.16.1",
     "@types/d3-shape": "^3.1.8",
     "@types/markdown-it": "^14.1.2",
     "@types/node": "^20",