Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/tools/lint-diff/package.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"name": "@azure-tools/lint-diff",
"private": true,
Expand Down Expand Up @@ -35,7 +35,7 @@
"@eslint/js": "^9.22.0",
"@types/deep-eql": "^4.0.2",
"@types/node": "^20.0.0",
"@vitest/coverage-v8": "^3.0.2",
"@vitest/coverage-v8": "^4.0.15",
"cross-env": "^10.1.0",
"eslint": "^9.22.0",
"execa": "^9.5.2",
Expand All @@ -44,6 +44,6 @@
"prettier-plugin-organize-imports": "^4.2.0",
"typescript": "~5.9.2",
"typescript-eslint": "^8.45.0",
"vitest": "^3.2.4"
"vitest": "^4.0.15"
}
}
5 changes: 5 additions & 0 deletions eng/tools/lint-diff/vitest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// @ts-check

import { baseConfig } from "../vitest.base.config.js";

export default baseConfig;
3 changes: 2 additions & 1 deletion eng/tools/oav-runner/package.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"name": "@azure-tools/oav-runner",
"private": true,
Expand Down Expand Up @@ -25,13 +25,14 @@
"devDependencies": {
"@eslint/js": "^9.22.0",
"@types/node": "^20.0.0",
"@vitest/coverage-v8": "^4.0.15",
"cross-env": "^10.1.0",
"eslint": "^9.22.0",
"prettier": "3.7.4",
"prettier-plugin-organize-imports": "^4.2.0",
"typescript": "~5.9.2",
"typescript-eslint": "^8.45.0",
"vitest": "^3.2.4"
"vitest": "^4.0.15"
},
"engines": {
"node": ">=20.0.0"
Expand Down
5 changes: 5 additions & 0 deletions eng/tools/oav-runner/vitest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// @ts-check

import { baseConfig } from "../vitest.base.config.js";

export default baseConfig;
4 changes: 2 additions & 2 deletions eng/tools/openapi-diff-runner/package.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"name": "@azure-tools/openapi-diff-runner",
"private": true,
Expand All @@ -23,10 +23,10 @@
},
"devDependencies": {
"@types/node": "^20.0.0",
"@vitest/coverage-v8": "^3.1.2",
"@vitest/coverage-v8": "^4.0.15",
"prettier": "3.7.4",
"prettier-plugin-organize-imports": "^4.2.0",
"typescript": "~5.9.2",
"vitest": "^3.2.4"
"vitest": "^4.0.15"
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { SpecModel } from "@azure-tools/specs-shared/spec-model";
import { existsSync } from "node:fs";
import * as path from "node:path";
Expand Down Expand Up @@ -233,11 +233,13 @@
setupSpecModelMock: (mockInstance?: any) => {
if (mockInstance) {
// Use the provided instance
vi.mocked(SpecModel).mockImplementation(() => mockInstance as unknown as SpecModel);
vi.mocked(SpecModel).mockImplementation(function () {
return mockInstance as unknown as SpecModel;
});
return mockInstance;
} else {
// Create different instances based on folder path
vi.mocked(SpecModel).mockImplementation((folder: string) => {
vi.mocked(SpecModel).mockImplementation(function (folder: string) {
return TestFixtures.createMockSpecModel(folder) as unknown as SpecModel;
});
return null; // No specific instance to return
Expand Down Expand Up @@ -727,7 +729,9 @@
{ path: "/test/swagger2.json" },
]);

vi.mocked(SpecModel).mockImplementation(() => mockSpecModelInstance);
vi.mocked(SpecModel).mockImplementation(function () {
return mockSpecModelInstance;
});
vi.mocked(getPrecedingSwaggers).mockResolvedValue({
stable: "/test/previous-stable.json",
preview: "/test/previous-preview.json",
Expand Down Expand Up @@ -778,7 +782,9 @@
};

// Mock SpecModel constructor directly
vi.mocked(SpecModel).mockImplementation(() => mockSpecModelInstance as unknown as SpecModel);
vi.mocked(SpecModel).mockImplementation(function () {
return mockSpecModelInstance as unknown as SpecModel;
});

// Mock getExistedVersionOperations to return a proper Map
vi.mocked(getExistedVersionOperations).mockResolvedValue(new Map());
Expand Down
5 changes: 5 additions & 0 deletions eng/tools/openapi-diff-runner/vitest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// @ts-check

import { baseConfig } from "../vitest.base.config.js";

export default baseConfig;
4 changes: 2 additions & 2 deletions eng/tools/sdk-suppressions/package.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"name": "@azure-tools/sdk-suppressions",
"private": true,
Expand Down Expand Up @@ -30,10 +30,10 @@
"@types/debug": "^4.1.12",
"@types/lodash": "^4.14.161",
"@types/node": "^20.0.0",
"@vitest/coverage-v8": "^3.1.2",
"@vitest/coverage-v8": "^4.0.15",
"prettier": "3.7.4",
"prettier-plugin-organize-imports": "^4.2.0",
"typescript": "~5.9.2",
"vitest": "^3.2.4"
"vitest": "^4.0.15"
}
}
5 changes: 5 additions & 0 deletions eng/tools/sdk-suppressions/vitest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// @ts-check

import { baseConfig } from "../vitest.base.config.js";

export default baseConfig;
4 changes: 2 additions & 2 deletions eng/tools/spec-gen-sdk-runner/package.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"name": "@azure-tools/spec-gen-sdk-runner",
"private": true,
Expand All @@ -24,10 +24,10 @@
},
"devDependencies": {
"@types/node": "^20.0.0",
"@vitest/coverage-v8": "^3.1.2",
"@vitest/coverage-v8": "^4.0.15",
"prettier": "3.7.4",
"prettier-plugin-organize-imports": "^4.2.0",
"typescript": "~5.9.2",
"vitest": "^3.2.4"
"vitest": "^4.0.15"
}
}
6 changes: 4 additions & 2 deletions eng/tools/spec-gen-sdk-runner/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { defineConfig } from "vite";
import { configDefaults } from "vitest/config";
import { configDefaults, defineConfig } from "vitest/config";

export default defineConfig({
test: {
...configDefaults,
// By default, vitest@4 only excludes tests from "node_modules" and ".git" folders (not "dist").
// Recommended fix is to *include* only the folders you want (more performant than excluding).
dir: "./test",
// eslint-disable-next-line unicorn/numeric-separators-style
testTimeout: 20000,
coverage: {
Expand Down
3 changes: 2 additions & 1 deletion eng/tools/summarize-impact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
"@types/commonmark": "0.27.10",
"@types/lodash": "^4.14.161",
"@types/node": "^20.0.0",
"@vitest/coverage-v8": "^4.0.15",
"prettier": "3.7.4",
"prettier-plugin-organize-imports": "^4.2.0",
"typescript": "~5.9.2",
"vitest": "^3.2.4"
"vitest": "^4.0.15"
},
"engines": {
"node": ">=20.0.0"
Expand Down
5 changes: 5 additions & 0 deletions eng/tools/summarize-impact/vitest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// @ts-check

import { baseConfig } from "../vitest.base.config.js";

export default baseConfig;
4 changes: 2 additions & 2 deletions eng/tools/suppressions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
"@azure-tools/specs-shared": "file:../../../.github/shared",
"@eslint/js": "^9.22.0",
"@types/node": "^20.0.0",
"@vitest/coverage-v8": "^3.1.2",
"@vitest/coverage-v8": "^4.0.15",
"cross-env": "^10.1.0",
"eslint": "^9.22.0",
"prettier": "3.7.4",
"prettier-plugin-organize-imports": "^4.2.0",
"typescript": "~5.9.2",
"typescript-eslint": "^8.45.0",
"vitest": "^3.2.4"
"vitest": "^4.0.15"
}
}
3 changes: 3 additions & 0 deletions eng/tools/suppressions/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ import { configDefaults, defineConfig } from "vitest/config";

export default defineConfig({
test: {
// By default, vitest@4 only excludes tests from "node_modules" and ".git" folders (not "dist").
// Recommended fix is to *include* only the folders you want (more performant than excluding).
dir: "./test",
coverage: {
exclude: [...configDefaults.coverage.exclude!, "cmd/**", "src/index.ts"],
},
Expand Down
2 changes: 1 addition & 1 deletion eng/tools/tsp-client-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"prettier": "3.7.4",
"prettier-plugin-organize-imports": "^4.2.0",
"typescript": "~5.9.2",
"vitest": "^3.2.4"
"vitest": "^4.0.15"
},
"scripts": {
"build": "tsc --build",
Expand Down
5 changes: 4 additions & 1 deletion eng/tools/tsp-client-tests/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { defineConfig } from "vite";
import { defineConfig } from "vitest/config";

export default defineConfig({
test: {
// By default, vitest@4 only excludes tests from "node_modules" and ".git" folders (not "dist").
// Recommended fix is to *include* only the folders you want (more performant than excluding).
dir: "./test",
testTimeout: 240000,
},
});
2 changes: 1 addition & 1 deletion eng/tools/typespec-requirement/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"prettier": "3.7.4",
"prettier-plugin-organize-imports": "^4.2.0",
"typescript": "~5.9.2",
"vitest": "^3.2.4"
"vitest": "^4.0.15"
},
"scripts": {
"build": "tsc --build",
Expand Down
5 changes: 4 additions & 1 deletion eng/tools/typespec-requirement/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { defineConfig } from "vite";
import { defineConfig } from "vitest/config";

export default defineConfig({
test: {
// By default, vitest@4 only excludes tests from "node_modules" and ".git" folders (not "dist").
// Recommended fix is to *include* only the folders you want (more performant than excluding).
dir: "./test",
// Default timeout of 5 seconds is too low
testTimeout: 20000,
},
Expand Down
4 changes: 2 additions & 2 deletions eng/tools/typespec-validation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
"@eslint/js": "^9.22.0",
"@types/debug": "^4.1.12",
"@types/node": "^20.0.0",
"@vitest/coverage-v8": "^3.1.2",
"@vitest/coverage-v8": "^4.0.15",
"cross-env": "^10.1.0",
"eslint": "^9.22.0",
"prettier": "3.7.4",
"prettier-plugin-organize-imports": "^4.2.0",
"typescript": "~5.9.2",
"typescript-eslint": "^8.45.0",
"vitest": "^3.2.4"
"vitest": "^4.0.15"
},
"scripts": {
"build": "tsc --build",
Expand Down
5 changes: 5 additions & 0 deletions eng/tools/typespec-validation/vitest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// @ts-check

import { baseConfig } from "../vitest.base.config.js";

export default baseConfig;
11 changes: 11 additions & 0 deletions eng/tools/vitest.base.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// @ts-check

import { defineConfig } from "vitest/config";

export const baseConfig = defineConfig({
test: {
// By default, vitest@4 only excludes tests from "node_modules" and ".git" folders (not "dist").
// Recommended fix is to *include* only the folders you want (more performant than excluding).
dir: "./test",
},
});
Loading