diff --git a/cspell.json b/cspell.json index b857a7b..ef37bc7 100644 --- a/cspell.json +++ b/cspell.json @@ -9,6 +9,7 @@ "dictionaryDefinitions": [], "dictionaries": [], "words": [ + "Invocables", "Microtask", "Microtasks", "mnaoumov", @@ -16,7 +17,8 @@ "obsidianmd", "offref", "Promisable", - "tsbuildinfo" + "tsbuildinfo", + "unnumber" ], "ignoreWords": [], "import": [], diff --git a/package-lock.json b/package-lock.json index 15c216e..bcef1ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@commitlint/cli": "^21.2.1", "@commitlint/config-conventional": "^21.2.0", "@commitlint/types": "^21.2.0", - "@obsidian-typings/obsidian-public-latest": "^6.24.0", + "@obsidian-typings/obsidian-public-latest": "^6.25.0", "@total-typescript/ts-reset": "^0.6.1", "@tsconfig/strictest": "^2.0.8", "@types/node": "^26.1.1", @@ -27,7 +27,7 @@ "nano-staged": "^1.0.2", "obsidian": "^1.13.1", "obsidian-dev-utils": "^87.3.0", - "obsidian-integration-testing": "^8.4.0", + "obsidian-integration-testing": "^9.1.0", "obsidian-test-mocks": "^3.6.0", "type-fest": "^5.8.0", "typescript": "6.0.3", @@ -2543,9 +2543,9 @@ } }, "node_modules/@obsidian-typings/obsidian-public-1.12.7": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/@obsidian-typings/obsidian-public-1.12.7/-/obsidian-public-1.12.7-6.26.0.tgz", - "integrity": "sha512-/EQqzZlpmub7nY3St+gaLISgoqTBo2cBFgLZZOdPZEz/VRaSLCK03g8X4TzDRIZ85uEGdu8VHoCPUm97tRaFuA==", + "version": "6.27.0", + "resolved": "https://registry.npmjs.org/@obsidian-typings/obsidian-public-1.12.7/-/obsidian-public-1.12.7-6.27.0.tgz", + "integrity": "sha512-nISDPxpPj2THutBUMYIBqCUqbIe+LFkm7Qb1POp6PiVTZmgisfyOYMehiHsGwvjJOiVWVFgm8Ebo52PjCWFmEw==", "dev": true, "license": "MIT", "peerDependencies": { @@ -2553,13 +2553,13 @@ } }, "node_modules/@obsidian-typings/obsidian-public-latest": { - "version": "6.24.0", - "resolved": "https://registry.npmjs.org/@obsidian-typings/obsidian-public-latest/-/obsidian-public-latest-6.24.0.tgz", - "integrity": "sha512-tRKsKw/SYiRB/3ucQIE3cKk8pQJIignsRe65fmb+/XbHIVetiHnO8Ke8PEN9WsLiY3tlNzNU+WGksA578JGaMw==", + "version": "6.25.0", + "resolved": "https://registry.npmjs.org/@obsidian-typings/obsidian-public-latest/-/obsidian-public-latest-6.25.0.tgz", + "integrity": "sha512-zDQkOHkx/88LU+zPQ9ZYlyjOPFuYpieqal4U89s1NAEjFaHdP1H1CROO0MXnABxkRXaDeIv7OMP7gzoyuKIt4g==", "dev": true, "license": "MIT", "dependencies": { - "@obsidian-typings/obsidian-public-1.12.7": "^6.26.0" + "@obsidian-typings/obsidian-public-1.12.7": "^6.27.0" } }, "node_modules/@oxc-project/types": { @@ -8707,9 +8707,9 @@ "license": "MIT" }, "node_modules/fast-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", - "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.4.tgz", + "integrity": "sha512-8JnbkQ4juDyvYs4mgFGQqg4yCYtFDtUtmp2QIQq11ZZe5CFQ5wcqm1rqDgAh/QdMySuBnPzMUiJUNZG5N/AiQw==", "dev": true, "funding": [ { @@ -9602,9 +9602,9 @@ "license": "MIT" }, "node_modules/immutable": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz", - "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==", + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.9.tgz", + "integrity": "sha512-m8nVez3rwrgmWxtLMt1ZYXB2Lv7OKYn/disyxAlSDYAlKSlFoPPfIAmAM/M5xqL4m4C/wAPw7S2/CNaUii1Hxg==", "dev": true, "license": "MIT" }, @@ -12811,9 +12811,9 @@ } }, "node_modules/obsidian-integration-testing": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/obsidian-integration-testing/-/obsidian-integration-testing-8.4.0.tgz", - "integrity": "sha512-7hg2vn6bD4ApnS9x7Y+Hz5jGo4nglBcPyrqEqDeGkf+C2WisEUN5UdX7UzrS516jJ7rqxQB1ruy4/LJxqcqRCA==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/obsidian-integration-testing/-/obsidian-integration-testing-9.1.0.tgz", + "integrity": "sha512-33Nzd2rZI7NmtcBQ3dyJPMaJ0CsdixAKI83TmlI+48xVdJfBv4BhjIr3z0d80P6Ngjycg0iTQ7FJABr/U66LpQ==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index ad808be..48933b9 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "@commitlint/cli": "^21.2.1", "@commitlint/config-conventional": "^21.2.0", "@commitlint/types": "^21.2.0", - "@obsidian-typings/obsidian-public-latest": "^6.24.0", + "@obsidian-typings/obsidian-public-latest": "^6.25.0", "@total-typescript/ts-reset": "^0.6.1", "@tsconfig/strictest": "^2.0.8", "@types/node": "^26.1.1", @@ -64,7 +64,7 @@ "nano-staged": "^1.0.2", "obsidian": "^1.13.1", "obsidian-dev-utils": "^87.3.0", - "obsidian-integration-testing": "^8.4.0", + "obsidian-integration-testing": "^9.1.0", "obsidian-test-mocks": "^3.6.0", "type-fest": "^5.8.0", "typescript": "6.0.3", diff --git a/scripts/vitest-config.ts b/scripts/vitest-config.ts index aea9d0b..6df60a0 100644 --- a/scripts/vitest-config.ts +++ b/scripts/vitest-config.ts @@ -60,7 +60,7 @@ export const config = defineConfig({ test: { environment: 'node', fileParallelism: false, - globalSetup: ['obsidian-integration-testing/vitest-global-setup'], + globalSetup: ['obsidian-integration-testing/vitest-global-setup-plugin'], hookTimeout: BIG_TIMEOUT_IN_MILLISECONDS * HOOK_TIMEOUT_MULTIPLIER, include: ['src/**/*.desktop.integration.test.ts'], name: 'integration-tests:desktop', @@ -72,7 +72,7 @@ export const config = defineConfig({ test: { environment: 'node', fileParallelism: false, - globalSetup: ['obsidian-integration-testing/vitest-global-setup'], + globalSetup: ['obsidian-integration-testing/vitest-global-setup-plugin'], hookTimeout: PERFORMANCE_TIMEOUT_IN_MILLISECONDS, include: ['src/**/*.desktop-performance.integration.test.ts'], name: 'integration-tests:desktop-performance', @@ -91,7 +91,7 @@ export const config = defineConfig({ } }, fileParallelism: false, - globalSetup: ['obsidian-integration-testing/vitest-global-setup'], + globalSetup: ['obsidian-integration-testing/vitest-global-setup-plugin'], hookTimeout: ANDROID_TIMEOUT_IN_MILLISECONDS * HOOK_TIMEOUT_MULTIPLIER, include: ['src/**/*.android.integration.test.ts'], name: 'integration-tests:android', diff --git a/src/plugin.android.integration.test.ts b/src/plugin.android.integration.test.ts index 3edca19..7354012 100644 --- a/src/plugin.android.integration.test.ts +++ b/src/plugin.android.integration.test.ts @@ -1,4 +1,4 @@ -import { getTempVault } from 'obsidian-integration-testing/vitest-global-setup'; +import { getTempVault } from 'obsidian-integration-testing/vitest-global-setup-plugin'; import { describe, expect, diff --git a/src/plugin.desktop.integration.test.ts b/src/plugin.desktop.integration.test.ts index a463006..85fea55 100644 --- a/src/plugin.desktop.integration.test.ts +++ b/src/plugin.desktop.integration.test.ts @@ -1,5 +1,5 @@ import { evalInObsidian } from 'obsidian-integration-testing'; -import { getTempVault } from 'obsidian-integration-testing/vitest-global-setup'; +import { getTempVault } from 'obsidian-integration-testing/vitest-global-setup-plugin'; import { describe, expect,