From dfa114ad0cceefa6d6c1ccc9a428b12fa859b50f Mon Sep 17 00:00:00 2001 From: Maksim Stepanov <17935127+delatrie@users.noreply.github.com> Date: Mon, 2 Dec 2024 17:52:49 +0700 Subject: [PATCH 1/2] feat(cypress): differentiate browser/node in exports --- packages/allure-cypress/package.json | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/allure-cypress/package.json b/packages/allure-cypress/package.json index 2faed09f1..6d7dcaa40 100644 --- a/packages/allure-cypress/package.json +++ b/packages/allure-cypress/package.json @@ -26,13 +26,21 @@ "exports": { ".": { "types": "./dist/types/index.d.ts", - "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js" + "node": { + "import": "./dist/esm/reporter.js", + "require": "./dist/cjs/reporter.js" + }, + "browser": { + "import": "./dist/esm/index.js", + "require": "./dist/cjs/index.js" + } }, "./reporter": { "types": "./dist/types/reporter.d.ts", - "import": "./dist/esm/reporter.js", - "require": "./dist/cjs/reporter.js" + "node": { + "import": "./dist/esm/reporter.js", + "require": "./dist/cjs/reporter.js" + } } }, "main": "./dist/cjs/index.js", From cf6c18316525d8102b4bf8c46718f0042b81c6f2 Mon Sep 17 00:00:00 2001 From: Maksim Stepanov <17935127+delatrie@users.noreply.github.com> Date: Mon, 2 Dec 2024 18:44:59 +0700 Subject: [PATCH 2/2] test(cypress): fix module resolution in tests --- packages/allure-cypress/test/utils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/allure-cypress/test/utils.ts b/packages/allure-cypress/test/utils.ts index beca31d53..55cb4f172 100644 --- a/packages/allure-cypress/test/utils.ts +++ b/packages/allure-cypress/test/utils.ts @@ -80,8 +80,8 @@ export const runCypressInlineTest = async ( await step("Prepare files", async () => { const allureCommonsModulePath = require.resolve("allure-js-commons"); - const allureCypressModulePath = require.resolve("allure-cypress"); - const allureCypressReporterModulePath = require.resolve("allure-cypress/reporter"); + const allureCypressReporterModulePath = require.resolve("allure-cypress"); + const allureCypressModulePath = join(dirname(allureCypressReporterModulePath), "index.js"); // eslint-disable-next-line guard-for-in for (const testFile in testFilesToWrite) {