Skip to content

Commit

Permalink
rename scope from @allure to @allurereport
Browse files Browse the repository at this point in the history
  • Loading branch information
baev committed Dec 12, 2024
1 parent 50cc7b6 commit 7901a26
Show file tree
Hide file tree
Showing 152 changed files with 2,509 additions and 2,512 deletions.
4,136 changes: 2,068 additions & 2,068 deletions .pnp.cjs

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,3 @@ supportedArchitectures:
yarnPath: .yarn/releases/yarn-4.5.1.cjs

npmPublishRegistry: https://registry.npmjs.org
npmScopes:
allure:
npmPublishRegistry: https://registry.npmjs.org
18 changes: 9 additions & 9 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
"test": "vitest run"
},
"dependencies": {
"@allure/core": "workspace:*",
"@allure/core-api": "workspace:*",
"@allure/directory-watcher": "workspace:*",
"@allure/plugin-awesome": "workspace:*",
"@allure/plugin-progress": "workspace:*",
"@allure/plugin-server-reload": "workspace:*",
"@allure/plugin-slack": "workspace:*",
"@allure/reader-api": "workspace:*",
"@allure/static-server": "workspace:*",
"@allurereport/core": "workspace:*",
"@allurereport/core-api": "workspace:*",
"@allurereport/directory-watcher": "workspace:*",
"@allurereport/plugin-awesome": "workspace:*",
"@allurereport/plugin-progress": "workspace:*",
"@allurereport/plugin-server-reload": "workspace:*",
"@allurereport/plugin-slack": "workspace:*",
"@allurereport/reader-api": "workspace:*",
"@allurereport/static-server": "workspace:*",
"cac": "^6.7.14",
"lodash.omit": "^4.5.0",
"yoctocolors": "^2.1.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/commands/awesome.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AllureReport, resolveConfig } from "@allure/core";
import { AllureReport, resolveConfig } from "@allurereport/core";
import { createCommand } from "../utils/commands.js";

type AwesomeCommandOptions = {
Expand All @@ -20,7 +20,7 @@ export const AwesomeCommandAction = async (resultsDir: string, options: AwesomeC
historyPath,
knownIssuesPath,
plugins: {
"@allure/plugin-awesome": {
"@allurereport/plugin-awesome": {
options: rest,
},
},
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/commands/classic.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AllureReport, resolveConfig } from "@allure/core";
import { AllureReport, resolveConfig } from "@allurereport/core";
import { createCommand } from "../utils/commands.js";

type ClassicCommandOptions = {
Expand All @@ -19,7 +19,7 @@ export const ClassicCommandAction = async (resultsDir: string, options: ClassicC
historyPath,
knownIssuesPath,
plugins: {
"@allure/plugin-classic": {
"@allurereport/plugin-classic": {
options: rest,
},
},
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/commands/csv.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AllureReport, resolveConfig } from "@allure/core";
import { AllureReport, resolveConfig } from "@allurereport/core";
import { createCommand } from "../utils/commands.js";

type CsvCommandOptions = {
Expand All @@ -12,7 +12,7 @@ export const CsvCommandAction = async (resultsDir: string, options: CsvCommandOp
const before = new Date().getTime();
const config = await resolveConfig({
plugins: {
"@allure/plugin-csv": {
"@allurereport/plugin-csv": {
options,
},
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/generate.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AllureReport, readRuntimeConfig } from "@allure/core";
import { AllureReport, readRuntimeConfig } from "@allurereport/core";
import { createCommand } from "../utils/commands.js";

type CommandOptions = {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/history.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AllureReport, resolveConfig } from "@allure/core";
import { AllureReport, resolveConfig } from "@allurereport/core";
import { createCommand } from "../utils/commands.js";

type CommandOptions = {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/knownIssue.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AllureReport, createConfig, writeKnownIssues } from "@allure/core";
import { AllureReport, createConfig, writeKnownIssues } from "@allurereport/core";
import console from "node:console";
import { resolve } from "node:path";
import { createCommand } from "../utils/commands.js";
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/commands/log.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AllureReport, resolveConfig } from "@allure/core";
import { AllureReport, resolveConfig } from "@allurereport/core";
import { createCommand } from "../utils/commands.js";

export type LogCommandOptions = {
Expand All @@ -12,7 +12,7 @@ export const LogCommandAction = async (resultsDir: string, options: LogCommandOp

const config = await resolveConfig({
plugins: {
"@allure/plugin-log": {
"@allurereport/plugin-log": {
options,
},
},
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/commands/open.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { readRuntimeConfig } from "@allure/core";
import { serve } from "@allure/static-server";
import { readRuntimeConfig } from "@allurereport/core";
import { serve } from "@allurereport/static-server";
import { createCommand } from "../utils/commands.js";

type CommandOptions = {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/qualityGate.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AllureReport, readRuntimeConfig } from "@allure/core";
import { AllureReport, readRuntimeConfig } from "@allurereport/core";
import console from "node:console";
import process from "node:process";
import { bold, red } from "yoctocolors";
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/src/commands/run.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { AllureReport, isFileNotFoundError, readRuntimeConfig } from "@allure/core";
import { createTestPlan } from "@allure/core-api";
import { AllureReport, isFileNotFoundError, readRuntimeConfig } from "@allurereport/core";
import { createTestPlan } from "@allurereport/core-api";
import {
Watcher,
allureResultsDirectoriesWatcher,
delayedFileProcessingWatcher,
newFilesInDirectoryWatcher,
} from "@allure/directory-watcher";
import AllureAwesome from "@allure/plugin-awesome";
import { PathResultFile } from "@allure/reader-api";
} from "@allurereport/directory-watcher";
import AllureAwesome from "@allurereport/plugin-awesome";
import { PathResultFile } from "@allurereport/reader-api";
import * as console from "node:console";
import { mkdtemp, realpath, rm, writeFile } from "node:fs/promises";
import { tmpdir } from "node:os";
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/commands/slack.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AllureReport, resolveConfig } from "@allure/core";
import { AllureReport, resolveConfig } from "@allurereport/core";
import { createCommand } from "../utils/commands.js";

type CommandOptions = {
Expand All @@ -10,7 +10,7 @@ export const SlackCommandAction = async (resultsDir: string, options: CommandOpt
const before = new Date().getTime();
const config = await resolveConfig({
plugins: {
"@allure/plugin-slack": {
"@allurereport/plugin-slack": {
options,
},
},
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/commands/testplan.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AllureReport, resolveConfig } from "@allure/core";
import { AllureReport, resolveConfig } from "@allurereport/core";
import { basename, dirname, resolve } from "node:path";
import { createCommand } from "../utils/commands.js";

Expand All @@ -14,7 +14,7 @@ export const TestPlanCommandAction = async (resultsDir: string, options: Command
const config = await resolveConfig({
output: output,
plugins: {
"@allure/plugin-testplan": {
"@allurereport/plugin-testplan": {
options: { fileName },
},
},
Expand Down
14 changes: 7 additions & 7 deletions packages/cli/src/commands/watch.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { AllureReport, isFileNotFoundError, readRuntimeConfig } from "@allure/core";
import { newFilesInDirectoryWatcher } from "@allure/directory-watcher";
import AllureAwesome from "@allure/plugin-awesome";
import ProgressPlugin from "@allure/plugin-progress";
import ServerReloadPlugin from "@allure/plugin-server-reload";
import { PathResultFile } from "@allure/reader-api";
import { serve } from "@allure/static-server";
import { AllureReport, isFileNotFoundError, readRuntimeConfig } from "@allurereport/core";
import { newFilesInDirectoryWatcher } from "@allurereport/directory-watcher";
import AllureAwesome from "@allurereport/plugin-awesome";
import ProgressPlugin from "@allurereport/plugin-progress";
import ServerReloadPlugin from "@allurereport/plugin-server-reload";
import { PathResultFile } from "@allurereport/reader-api";
import { serve } from "@allurereport/static-server";
import * as console from "node:console";
import { rm } from "node:fs/promises";
import { join, resolve } from "node:path";
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defineConfig } from "@allure/core";
import { defineConfig } from "@allurereport/core";
import { cac } from "cac";
import console from "node:console";
import { readFileSync } from "node:fs";
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/utils/terminal.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TestResult, TestStatus, formatDuration } from "@allure/core-api";
import { TestResult, TestStatus, formatDuration } from "@allurereport/core-api";
import console from "node:console";
import { blue, gray, green, red, yellow } from "yoctocolors";

Expand Down
6 changes: 3 additions & 3 deletions packages/core-api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The collection of interfaces describing the core Allure Report entities.
Use your favorite package manager to install the package:

```shell
npm add @allure/core-api
yarn add @allure/core-api
pnpm add @allure/core-api
npm add @allurereport/core-api
yarn add @allurereport/core-api
pnpm add @allurereport/core-api
```
2 changes: 1 addition & 1 deletion packages/core-api/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@allure/core-api",
"name": "@allurereport/core-api",
"version": "3.0.0-beta.2",
"description": "Allure Core API",
"keywords": [
Expand Down
6 changes: 3 additions & 3 deletions packages/core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The package includes a collection of utilities which are used across all Allure
Use your favorite package manager to install the package:

```shell
npm add @allure/core
yarn add @allure/core
pnpm add @allure/core
npm add @allurereport/core
yarn add @allurereport/core
pnpm add @allurereport/core
```
24 changes: 12 additions & 12 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@allure/core",
"name": "@allurereport/core",
"version": "3.0.0-beta.2",
"description": "Collection of generic Allure utilities used across the entire project",
"keywords": [
Expand All @@ -23,17 +23,17 @@
"test": "vitest run"
},
"dependencies": {
"@allure/core-api": "workspace:*",
"@allure/plugin-api": "workspace:*",
"@allure/plugin-awesome": "workspace:*",
"@allure/plugin-classic": "workspace:*",
"@allure/plugin-csv": "workspace:*",
"@allure/plugin-log": "workspace:*",
"@allure/plugin-progress": "workspace:*",
"@allure/plugin-slack": "workspace:*",
"@allure/plugin-testplan": "workspace:*",
"@allure/reader": "workspace:*",
"@allure/reader-api": "workspace:*",
"@allurereport/core-api": "workspace:*",
"@allurereport/plugin-api": "workspace:*",
"@allurereport/plugin-awesome": "workspace:*",
"@allurereport/plugin-classic": "workspace:*",
"@allurereport/plugin-csv": "workspace:*",
"@allurereport/plugin-log": "workspace:*",
"@allurereport/plugin-progress": "workspace:*",
"@allurereport/plugin-slack": "workspace:*",
"@allurereport/plugin-testplan": "workspace:*",
"@allurereport/reader": "workspace:*",
"@allurereport/reader-api": "workspace:*",
"markdown-it": "^14.1.0"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/api.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { HistoryDataPoint, KnownTestFailure } from "@allure/core-api";
import type { Plugin, QualityGateConfig, ReportFiles } from "@allure/plugin-api";
import type { ResultsReader } from "@allure/reader-api";
import type { HistoryDataPoint, KnownTestFailure } from "@allurereport/core-api";
import type { Plugin, QualityGateConfig, ReportFiles } from "@allurereport/plugin-api";
import type { ResultsReader } from "@allurereport/reader-api";

export interface FullConfig {
name: string;
Expand Down
12 changes: 6 additions & 6 deletions packages/core/src/config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Config, PluginDescriptor } from "@allure/plugin-api";
import type { QualityGateConfig } from "@allure/plugin-api";
import type { Config, PluginDescriptor } from "@allurereport/plugin-api";
import type { QualityGateConfig } from "@allurereport/plugin-api";
import { readdir } from "node:fs/promises";
import { join, resolve } from "node:path";
import * as process from "node:process";
Expand All @@ -9,7 +9,7 @@ import { readKnownIssues } from "./known.js";
import { FileSystemReportFiles } from "./plugin.js";
import { importWrapper } from "./utils/module.js";

export { defineConfig } from "@allure/plugin-api";
export { defineConfig } from "@allurereport/plugin-api";

export const createConfig = async (opts: {
reportName?: string;
Expand Down Expand Up @@ -103,10 +103,10 @@ export const resolveConfig = async (
};

export const resolvePlugin = async (path: string) => {
// try to append @allure/plugin- scope
if (!path.startsWith("@allure/plugin-")) {
// try to append @allurereport/plugin- scope
if (!path.startsWith("@allurereport/plugin-")) {
try {
const module = await importWrapper(`@allure/plugin-${path}`);
const module = await importWrapper(`@allurereport/plugin-${path}`);

return module.default;
} catch (err) {}
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/history.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { HistoryDataPoint, HistoryTestResult, TestCase, TestResult } from "@allure/core-api";
import type { HistoryDataPoint, HistoryTestResult, TestCase, TestResult } from "@allurereport/core-api";
import { mkdir, readFile, writeFile } from "node:fs/promises";
import { dirname, resolve } from "node:path";
import { isFileNotFoundError } from "./utils/misc.js";
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/known.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { KnownTestFailure, TestStatus } from "@allure/core-api";
import type { AllureStore } from "@allure/plugin-api";
import type { KnownTestFailure, TestStatus } from "@allurereport/core-api";
import type { AllureStore } from "@allurereport/plugin-api";
import { readFile, writeFile } from "node:fs/promises";
import { resolve } from "node:path";
import { isFileNotFoundError } from "./utils/misc.js";
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/plugin.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PluginState, ReportFiles } from "@allure/plugin-api";
import { PluginState, ReportFiles } from "@allurereport/plugin-api";
import { mkdir, writeFile } from "node:fs/promises";
import { dirname, join, resolve } from "node:path";

Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/qualityGate.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { filterSuccessful, filterUnsuccessful } from "@allure/core-api";
import { filterSuccessful, filterUnsuccessful } from "@allurereport/core-api";
import type {
AllureStore,
QualityGateConfig,
Expand All @@ -7,7 +7,7 @@ import type {
QualityGateValidationResult,
QualityGateValidator,
QualityGateValidatorConstructor,
} from "@allure/plugin-api";
} from "@allurereport/plugin-api";

// TODO replace abstraction with a helper method
export abstract class AbstractQualityGateValidator implements QualityGateValidator {
Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/report.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Plugin, PluginContext, PluginState, ReportFiles, ResultFile } from "@allure/plugin-api";
import { allure1, allure2, attachments, junitXml } from "@allure/reader";
import { PathResultFile, type ResultsReader } from "@allure/reader-api";
import type { Plugin, PluginContext, PluginState, ReportFiles, ResultFile } from "@allurereport/plugin-api";
import { allure1, allure2, attachments, junitXml } from "@allurereport/reader";
import { PathResultFile, type ResultsReader } from "@allurereport/reader-api";
import console from "node:console";
import { randomUUID } from "node:crypto";
import { EventEmitter } from "node:events";
Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/store/convert.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import {
TestStatus,
TestStepResult,
notNull,
} from "@allure/core-api";
import { findByLabelName } from "@allure/core-api";
import { md5 } from "@allure/plugin-api";
} from "@allurereport/core-api";
import { findByLabelName } from "@allurereport/core-api";
import { md5 } from "@allurereport/plugin-api";
import {
RawFixtureResult,
RawStep,
Expand All @@ -25,7 +25,7 @@ import {
RawTestParameter,
RawTestResult,
ReaderContext,
} from "@allure/reader-api";
} from "@allurereport/reader-api";
import MarkdownIt from "markdown-it";
import { randomUUID } from "node:crypto";
import { extname } from "node:path";
Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/store/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import {
nullsLast,
ordinal,
reverse,
} from "@allure/core-api";
import { AllureStore, ResultFile, md5 } from "@allure/plugin-api";
import type { RawFixtureResult, RawMetadata, RawTestResult, ReaderContext, ResultsVisitor } from "@allure/reader-api";
} from "@allurereport/core-api";
import { AllureStore, ResultFile, md5 } from "@allurereport/plugin-api";
import type { RawFixtureResult, RawMetadata, RawTestResult, ReaderContext, ResultsVisitor } from "@allurereport/reader-api";
import { EventEmitter } from "node:events";
import { extname } from "node:path";
import { AllureStoreEvents } from "../utils/event.js";
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/utils/event.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { BatchOptions, Realtime } from "@allure/plugin-api";
import type { BatchOptions, Realtime } from "@allurereport/plugin-api";
import console from "node:console";
import type { EventEmitter } from "node:events";
import { setTimeout } from "node:timers/promises";
Expand Down
Loading

0 comments on commit 7901a26

Please sign in to comment.