chore: rebase (#15)

* chore: rebase

* test: fix tests

packages/ci/src/gulp/prepublish.ts

@@ -18,7 +18,6 @@ const changeLogFile = "CHANGELOG.md";
 // print output of commands into the terminal
 const stdio = "inherit";
 const commitsConfig = { path: commitPath, ignore: /^chore: release/ };
-const commitsConfig = { path: commitPath, ignore: /^chore: release/ };
 
 async function bumpVersion(preset: Preset): Promise<string | null> {
   const bumper = new RestrictEmptyCommits(process.cwd())
@@ -27,7 +26,6 @@ async function bumpVersion(preset: Preset): Promise<string | null> {
       prefix: tagPrefix,
     })
     .commits(commitsConfig);
-    .commits(commitsConfig);
 
   const recommendation = await bumper.bump();
 

packages/di-react/src/useAbandonedRenderDisposer.test.ts

@@ -1,10 +1,9 @@
 // @vitest-environment happy-dom
 
-import { describe, expect, it, vi } from "vitest";
+import { afterEach, describe, expect, it, vi } from "vitest";
 import { renderHook } from "@testing-library/react";
 import "./tests/testingLibrary.js";
 import { useAbandonedRenderDisposer } from "./useAbandonedRenderDisposer.js";
-import { afterEach } from "node:test";
 
 describe("useAbandonedRenderDisposer", () => {
   afterEach(() => {

packages/di-react/src/useServiceAsync.test.tsx

@@ -1,6 +1,15 @@
 // @vitest-environment happy-dom
 
-import { describe, expect, it, vi } from "vitest";
+import {
+  afterAll,
+  afterEach,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  vi,
+  type MockInstance,
+} from "vitest";
 import { renderHook, screen } from "@testing-library/react";
 import "./tests/testingLibrary.js";
 import { useServiceAsync } from "./useServiceAsync.js";
@@ -12,16 +21,28 @@ import {
 } from "@wroud/di";
 import { ServiceProvider } from "./ServiceProvider.js";
 import { Suspense } from "react";
-import { afterEach } from "node:test";
 
 describe("useServiceAsync", () => {
+  let consoleWarn: MockInstance<
+    (message?: any, ...optionalParams: any[]) => void
+  >;
+
+  beforeEach(() => {
+    consoleWarn = vi.spyOn(console, "warn");
+    consoleWarn.mockImplementation(() => {});
+  });
+
   afterEach(() => {
     vi.restoreAllMocks();
     vi.useRealTimers();
+    consoleWarn.mockReset();
   });
+
+  afterAll(() => {
+    consoleWarn.mockReset();
+  });
+
   it("should resolve single service", async () => {
-    const consoleWarn = vi.spyOn(console, "warn");
-    consoleWarn.mockImplementation(() => {});
     const builder = new ServiceContainerBuilder();
 
     @injectable()
@@ -62,8 +83,6 @@ describe("useServiceAsync", () => {
     );
   });
   it("should resolve service with deps", async () => {
-    const consoleWarn = vi.spyOn(console, "warn");
-    consoleWarn.mockImplementation(() => {});
     const builder = new ServiceContainerBuilder();
 
     @injectable()

packages/di-react/src/useServicesAsync.test.tsx

@@ -1,6 +1,6 @@
 // @vitest-environment happy-dom
 
-import { describe, expect, it, vi } from "vitest";
+import { afterEach, describe, expect, it, vi } from "vitest";
 import { renderHook, screen } from "@testing-library/react";
 import "./tests/testingLibrary.js";
 import { useServicesAsync } from "./useServicesAsync.js";
@@ -12,7 +12,6 @@ import {
 } from "@wroud/di";
 import { ServiceProvider } from "./ServiceProvider.js";
 import { Suspense } from "react";
-import { afterEach } from "node:test";
 
 describe("useServicesAsync", () => {
   afterEach(() => {

packages/di/src/di/injectable.test.ts

@@ -1,7 +1,6 @@
-import { describe, expect, it, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import { injectable } from "./injectable.js";
 import { ServiceRegistry } from "./ServiceRegistry.js";
-import { beforeEach } from "node:test";
 
 vi.mock(import("./ServiceRegistry.js"), () => ({
   ServiceRegistry: {