fix peer deps, remove redundant deps (#1046)

.yarnrc.yml

@@ -3,15 +3,11 @@ compressionLevel: mixed
 enableGlobalCache: false
 
 packageExtensions:
-  allure-js-commons@*:
-    dependencies:
-      allure-playwright: "workspace:*"
-      allure-vitest: "workspace:*"
   codeceptjs@*:
     dependencies:
       debug: "*"
   newman@*:
-    dependencies:
+    peerDependencies:
       newman-reporter-allure: "workspace:*"
 
 plugins:

packages/allure-codeceptjs/babel.cjs.json

@@ -9,12 +9,12 @@
     [
       "@babel/preset-env",
       {
-        "modules": "commonjs",
+        "modules": "commonjs"
       }
     ]
   ],
   "plugins": [
-    "babel-plugin-add-module-exports",
+    "babel-plugin-add-module-exports"
   ],
   "targets": {
     "esmodules": false,

packages/allure-codeceptjs/package.json

@@ -68,11 +68,12 @@
     "eslint-plugin-n": "^17.0.0",
     "eslint-plugin-no-null": "^1.0.2",
     "eslint-plugin-prefer-arrow": "^1.2.3",
-    "expect": "^29.7.0",
     "npm-run-all2": "^6.1.2",
     "rimraf": "^5.0.1",
-    "ts-node": "^10.9.2",
     "typescript": "^5.2.2",
     "vitest": "^1.6.0"
+  },
+  "peerDependencies": {
+    "codeceptjs": ">=2.3.6"
   }
 }

packages/allure-codeceptjs/test/spec/skipped.test.ts

@@ -4,19 +4,19 @@ import { runCodeceptJsInlineTest } from "../utils.js";
 it("doesn't report skipped features and steps", async () => {
   const { tests } = await runCodeceptJsInlineTest({
     "skipped_feature1.test.js": `
-      xFeature("logout-feature");
+      xFeature("logout-feature1");
       Scenario("logout-scenario1", async () => {});
     `,
     "skipped_feature2.test.js": `
-      Feature.skip("logout-feature");
+      Feature.skip("logout-feature2");
       Scenario("logout-scenario1", async () => {});
     `,
     "skipped_scenario1.test.js": `
-      Feature("logout-feature");
+      Feature("logout-feature3");
       xScenario("logout-scenario1", async () => {});
     `,
     "skipped_scenario2.test.js": `
-      Feature("logout-feature");
+      Feature("logout-feature4");
       Scenario.skip("logout-scenario1", async () => {});
     `,
   });

packages/allure-cucumberjs/package.json

@@ -55,28 +55,16 @@
     "@babel/preset-env": "^7.24.6",
     "@babel/preset-typescript": "^7.24.6",
     "@cucumber/cucumber": "^10.8.0",
-    "@cucumber/gherkin": "^28.0.0",
-    "@cucumber/gherkin-streams": "^5.0.1",
-    "@cucumber/gherkin-utils": "^9.0.0",
-    "@cucumber/message-streams": "^4.0.1",
     "@cucumber/messages": "^25.0.1",
     "@types/babel__core": "^7",
     "@types/babel__preset-env": "^7",
-    "@types/chai": "^4.3.6",
-    "@types/chai-like": "^1.1.1",
-    "@types/chai-things": "^0.0.36",
     "@types/eslint": "^8",
-    "@types/glob": "^8.1.0",
     "@types/node": "^20.14.2",
-    "@types/sinon": "^17.0.0",
     "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^7.0.0",
     "allure-commandline": "^2.29.0",
     "allure-vitest": "workspace:*",
     "babel-plugin-add-module-exports": "^1.0.4",
-    "chai": "^4.3.8",
-    "chai-like": "^1.1.1",
-    "chai-things": "^0.2.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.28.1",
@@ -86,12 +74,11 @@
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "npm-run-all2": "^6.1.2",
     "rimraf": "^5.0.1",
-    "sinon": "^18.0.0",
-    "ts-node": "^10.9.2",
     "typescript": "^5.2.2",
     "vitest": "^1.6.0"
   },
   "peerDependencies": {
-    "@cucumber/cucumber": "^10.8.0"
+    "@cucumber/cucumber": ">=10.8.0",
+    "@cucumber/messages": ">=24.1.0"
   }
 }

packages/allure-cypress/package.json

@@ -66,16 +66,13 @@
     "@types/babel__core": "^7",
     "@types/babel__preset-env": "^7",
     "@types/eslint": "^8",
-    "@types/glob": "^8.1.0",
-    "@types/mocha": "^10.0.1",
     "@types/node": "^20.14.2",
     "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^7.0.0",
     "allure-commandline": "^2.29.0",
     "allure-vitest": "workspace:*",
     "babel-plugin-add-module-exports": "^1.0.4",
     "cypress": "^13.12.0",
-    "enquirer": "^2.3.6",
     "esbuild": "^0.22.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.0.0",
@@ -87,8 +84,15 @@
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "npm-run-all2": "^6.1.2",
     "rimraf": "^5.0.1",
-    "ts-node": "^10.9.2",
     "typescript": "^5.2.2",
     "vitest": "^1.6.0"
+  },
+  "peerDependencies": {
+    "cypress": ">=12.17.4"
+  },
+  "peerDependenciesMeta": {
+    "cypress": {
+      "optional": true
+    }
   }
 }

packages/allure-jasmine/package.json

@@ -64,11 +64,18 @@
     "eslint-plugin-n": "^17.0.0",
     "eslint-plugin-no-null": "^1.0.2",
     "eslint-plugin-prefer-arrow": "^1.2.3",
-    "jasmine": "^3.4.0",
+    "jasmine": "^5.1.0",
     "npm-run-all2": "^6.1.2",
     "rimraf": "^5.0.1",
-    "tslib": "^2.6.2",
     "typescript": "^5.2.2",
     "vitest": "^1.6.0"
+  },
+  "peerDependencies": {
+    "jasmine": ">=2.7.0"
+  },
+  "peerDependenciesMeta": {
+    "jasmine": {
+      "optional": true
+    }
   }
 }

packages/allure-jasmine/test/utils.ts

@@ -1,7 +1,7 @@
 import { fork } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
-import { dirname, extname, join } from "node:path";
+import path from "node:path";
 import { attachment, step } from "allure-js-commons";
 import type { AllureResults } from "allure-js-commons/sdk";
 import { MessageReader } from "allure-js-commons/sdk/reporter";
@@ -10,9 +10,9 @@ export const runJasmineInlineTest = async (
   files: Record<string, string>,
   env?: Record<string, string>,
 ): Promise<AllureResults> => {
-  const testDir = join(__dirname, "fixtures", randomUUID());
+  const testDir = path.join(__dirname, "fixtures", randomUUID());
   const testFiles = {
-    "spec/support/jasmine.json": await readFile(join(__dirname, "./samples/spec/support/jasmine.json"), "utf8"),
+    "spec/support/jasmine.json": await readFile(path.join(__dirname, "./samples/spec/support/jasmine.json"), "utf8"),
     // eslint-disable-next-line @typescript-eslint/no-require-imports
     "spec/helpers/allure.js": require("./samples/spec/helpers/modern/allure.cjs"),
     ...files,
@@ -22,16 +22,22 @@ export const runJasmineInlineTest = async (
 
   for (const file of Object.keys(testFiles)) {
     await step(file, async () => {
-      const filePath = join(testDir, file);
+      const filePath = path.join(testDir, file);
 
-      await mkdir(dirname(filePath), { recursive: true });
+      await mkdir(path.dirname(filePath), { recursive: true });
       const content: string = testFiles[file as keyof typeof testFiles];
       await writeFile(filePath, content, "utf8");
-      await attachment(file, content, { encoding: "utf-8", contentType: "text/plain", fileExtension: extname(file) });
+      await attachment(file, content, {
+        encoding: "utf-8",
+        contentType: "text/plain",
+        fileExtension: path.extname(file),
+      });
     });
   }
 
-  const modulePath = await step("resolve jasmine", () => require.resolve("jasmine/bin/jasmine"));
+  const modulePath = await step("resolve jasmine", () =>
+    path.resolve(require.resolve("jasmine"), "../../bin/jasmine.js"),
+  );
   const args: string[] = [];
   const testProcess = await step(`${modulePath} ${args.join(" ")}`, () => {
     return fork(modulePath, args, {
@@ -47,7 +53,6 @@ export const runJasmineInlineTest = async (
 
   const messageReader = new MessageReader();
 
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
   testProcess.on("message", messageReader.handleMessage);
   testProcess.stdout?.setEncoding("utf8").on("data", (chunk) => {
     process.stdout.write(String(chunk));

packages/allure-jest/package.json

@@ -47,25 +47,20 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@jest/expect": "^29.7.0",
-    "allure-js-commons": "workspace:*",
-    "jest-circus": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "jest-environment-node": "^29.7.0"
+    "allure-js-commons": "workspace:*"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.6",
     "@babel/core": "^7.24.6",
     "@babel/preset-env": "^7.24.6",
     "@babel/preset-typescript": "^7.24.6",
-    "@jest/core": "^29.7.0",
     "@jest/environment": "^29.7.0",
+    "@jest/expect": "^29.7.0",
     "@jest/types": "^29.6.3",
     "@types/babel__core": "^7",
     "@types/babel__preset-env": "^7",
     "@types/eslint": "^8",
     "@types/node": "^20.14.2",
-    "@types/source-map-support": "^0.5.7",
     "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^7.0.0",
     "allure-commandline": "^2.29.0",
@@ -79,12 +74,31 @@
     "eslint-plugin-no-null": "^1.0.2",
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "jest-cli": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "jest-environment-node": "^29.7.0",
     "npm-run-all2": "^6.1.2",
     "rimraf": "^5.0.1",
-    "source-map-support": "^0.5.21",
-    "ts-node": "^10.9.2",
-    "tslib": "^2.6.2",
     "typescript": "^5.2.2",
     "vitest": "^1.6.0"
+  },
+  "peerDependencies": {
+    "jest": ">=28.0.0",
+    "jest-cli": ">=28.0.0",
+    "jest-environment-jsdom": ">=28.0.0",
+    "jest-environment-node": ">=28.0.0"
+  },
+  "peerDependenciesMeta": {
+    "jest": {
+      "optional": true
+    },
+    "jest-cli": {
+      "optional": true
+    },
+    "jest-environment-jsdom": {
+      "optional": true
+    },
+    "jest-environment-node": {
+      "optional": true
+    }
   }
 }

packages/allure-js-commons/package.json

@@ -72,7 +72,6 @@
     "@types/eslint": "^8",
     "@types/md5": "^2",
     "@types/node": "^20.14.2",
-    "@types/source-map-support": "^0.5.7",
     "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^7.0.0",
     "eslint": "^8.57.0",
@@ -82,13 +81,17 @@
     "eslint-plugin-n": "^17.0.0",
     "eslint-plugin-no-null": "^1.0.2",
     "eslint-plugin-prefer-arrow": "^1.2.3",
-    "expect": "^29.7.0",
     "npm-run-all2": "^6.1.2",
     "rimraf": "^5.0.1",
-    "source-map-support": "^0.5.21",
-    "ts-node": "^10.9.2",
-    "tslib": "^2.6.2",
     "typescript": "^5.2.2",
     "vitest": "^1.6.0"
+  },
+  "peerDependencies": {
+    "allure-playwright": "workspace:*"
+  },
+  "peerDependenciesMeta": {
+    "allure-playwright": {
+      "optional": true
+    }
   }
 }

packages/allure-mocha/package.json

@@ -64,7 +64,6 @@
     "@babel/preset-typescript": "^7.24.6",
     "@types/babel__core": "^7",
     "@types/babel__preset-env": "^7",
-    "@types/chai": "^4.3.6",
     "@types/eslint": "^8",
     "@types/mocha": "^10.0.1",
     "@types/node": "^20.14.2",
@@ -74,9 +73,6 @@
     "allure-vitest": "workspace:*",
     "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-transform-import-meta": "^2.2.1",
-    "chai": "^4.3.8",
-    "chai-like": "^1.1.1",
-    "chai-things": "^0.2.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.28.1",
@@ -85,16 +81,13 @@
     "eslint-plugin-no-null": "^1.0.2",
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "glob": "^10.4.1",
-    "mocha": "^10.2.0",
+    "mocha": "^10.6.0",
     "npm-run-all2": "^6.1.2",
     "rimraf": "^5.0.1",
-    "source-map-support": "^0.5.21",
-    "ts-node": "^10.9.2",
-    "tslib": "^2.6.2",
     "typescript": "^5.2.2",
     "vitest": "^1.6.0"
   },
   "peerDependencies": {
-    "mocha": ">=6.2.x"
+    "mocha": ">=6.2.0"
   }
 }

packages/allure-mocha/src/AllureMochaReporter.ts

@@ -245,7 +245,7 @@ export class AllureMochaReporter extends Mocha.reporters.Base {
       return;
     }
 
-    const name = hook.originalTitle ?? "";
+    const name = hook.originalTitle ?? hook.title ?? "";
     if (hookCategory) {
       this.currentHook = this.runtime.startFixture(scopeUuid, hookCategory, { name });
     }

packages/allure-mocha/src/utils.ts

@@ -107,8 +107,8 @@ export const applyTestPlan = (ids: ReadonlySet<string>, selectors: ReadonlySet<s
 const hookTypeRegexp = /^"(before|after) (all|each)"/;
 
 export const getHookType = (hook: Mocha.Hook): HookType => {
-  if (hook.originalTitle) {
-    const match = hookTypeRegexp.exec(hook.originalTitle);
+  if (hook.title) {
+    const match = hookTypeRegexp.exec(hook.title);
     if (match) {
       return [match[1] as HookCategory, match[2] as HookScope];
     }

packages/allure-mocha/test/samples/spec/labels/suites/parentSuiteNestedScope.spec.js

@@ -1,6 +1,6 @@
-// cjs: const { it } = require("mocha");
+// cjs: const { describe, it } = require("mocha");
 // cjs: const { parentSuite } = require("allure-js-commons");
-// esm: import { it } from "mocha";
+// esm: import { describe, it } from "mocha";
 // esm: import { parentSuite } from "allure-js-commons";
 
 describe("foo", async () => {

packages/allure-mocha/test/samples/spec/labels/suites/subSuiteNestedScope.spec.js

@@ -1,6 +1,6 @@
-// cjs: const { it } = require("mocha");
+// cjs: const { describe, it } = require("mocha");
 // cjs: const { subSuite } = require("allure-js-commons");
-// esm: import { it } from "mocha";
+// esm: import { describe, it } from "mocha";
 // esm: import { subSuite } from "allure-js-commons";
 
 describe("foo", async () => {