diff --git a/nx.json b/nx.json index 251b8f366..7f294fb78 100644 --- a/nx.json +++ b/nx.json @@ -16,17 +16,29 @@ "e2e": { "dependsOn": ["^build"] }, - "nxv-pkg-install": { - "parallelism": false + "unit-test": { + "cache": true, + "inputs": ["default", "^production", "production", "test-setup"], + "executor": "@nx/vite:test", + "options": { + "configFile": "{projectRoot}/vitest.unit.config.ts", + "passWithNoTests": true, + "watch": false + } }, - "@nx/vite:test": { + "int-test": { "cache": true, - "inputs": ["default", "^production"], + "inputs": ["default", "^production", "test-setup"], + "executor": "@nx/vite:test", "options": { + "configFile": "{projectRoot}/vitest.int.config.ts", "passWithNoTests": true, "watch": false } }, + "nxv-pkg-install": { + "parallelism": false + }, "nx-release-publish": { "dependsOn": ["build"], "executor": "@nx/js:release-publish", @@ -53,6 +65,7 @@ "!{projectRoot}/code-pushup.config.?(m)[jt]s", "!{projectRoot}/zod2md.config.ts" ], + "test-setup": ["{workspaceRoot}/testing/test-setup/src/**/*"], "sharedGlobals": [] }, "workspaceLayout": { diff --git a/packages/ci/project.json b/packages/ci/project.json index a74f13988..b0468b377 100644 --- a/packages/ci/project.json +++ b/packages/ci/project.json @@ -17,18 +17,8 @@ "lint": { "executor": "@nx/eslint:lint" }, - "unit-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/ci/vitest.unit.config.ts" - } - }, - "int-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/ci/vitest.int.config.ts" - } - } + "unit-test": {}, + "int-test": {} }, "tags": ["scope:tooling", "type:feature", "publishable"] } diff --git a/packages/cli/project.json b/packages/cli/project.json index 180ef5c3f..f51015f5a 100644 --- a/packages/cli/project.json +++ b/packages/cli/project.json @@ -24,18 +24,8 @@ ] } }, - "unit-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/cli/vitest.unit.config.ts" - } - }, - "int-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/cli/vitest.int.config.ts" - } - }, + "unit-test": {}, + "int-test": {}, "run-help": { "command": "npx dist/packages/cli --help", "dependsOn": ["build"] diff --git a/packages/core/project.json b/packages/core/project.json index a830a353b..c357ad82a 100644 --- a/packages/core/project.json +++ b/packages/core/project.json @@ -24,18 +24,8 @@ ] } }, - "unit-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/core/vitest.unit.config.ts" - } - }, - "int-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/core/vitest.int.config.ts" - } - } + "unit-test": {}, + "int-test": {} }, "tags": ["scope:core", "type:feature", "publishable"] } diff --git a/packages/create-cli/project.json b/packages/create-cli/project.json index ed0c24c55..7ad75bc60 100644 --- a/packages/create-cli/project.json +++ b/packages/create-cli/project.json @@ -24,18 +24,8 @@ ] } }, - "unit-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/create-cli/vitest.unit.config.ts" - } - }, - "int-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/create-cli/vitest.int.config.ts" - } - }, + "unit-test": {}, + "int-test": {}, "exec-node": { "dependsOn": ["build"], "command": "node ./dist/packages/create-cli/src/index.js", diff --git a/packages/models/project.json b/packages/models/project.json index 2f2d65e89..b05c7252b 100644 --- a/packages/models/project.json +++ b/packages/models/project.json @@ -25,18 +25,8 @@ ] } }, - "unit-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/models/vitest.unit.config.ts" - } - }, - "int-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/models/vitest.int.config.ts" - } - }, + "unit-test": {}, + "int-test": {}, "generate-docs": { "command": "npx zod2md --config packages/models/zod2md.config.ts", "cache": true, diff --git a/packages/nx-plugin/project.json b/packages/nx-plugin/project.json index 73ed871d4..17c19bdac 100644 --- a/packages/nx-plugin/project.json +++ b/packages/nx-plugin/project.json @@ -48,18 +48,8 @@ ] } }, - "unit-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/nx-plugin/vitest.unit.config.ts" - } - }, - "int-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/nx-plugin/vitest.int.config.ts" - } - } + "unit-test": {}, + "int-test": {} }, "tags": ["scope:tooling", "type:feature", "publishable"] } diff --git a/packages/plugin-coverage/project.json b/packages/plugin-coverage/project.json index dbcc08847..37791c4a8 100644 --- a/packages/plugin-coverage/project.json +++ b/packages/plugin-coverage/project.json @@ -25,18 +25,8 @@ ] } }, - "unit-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/plugin-coverage/vitest.unit.config.ts" - } - }, - "int-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/plugin-coverage/vitest.int.config.ts" - } - } + "unit-test": {}, + "int-test": {} }, "tags": ["scope:plugin", "type:feature", "publishable"] } diff --git a/packages/plugin-eslint/project.json b/packages/plugin-eslint/project.json index 5d6c7fbe9..e6d010fcd 100644 --- a/packages/plugin-eslint/project.json +++ b/packages/plugin-eslint/project.json @@ -25,18 +25,8 @@ ] } }, - "unit-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/plugin-eslint/vitest.unit.config.ts" - } - }, - "int-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/plugin-eslint/vitest.int.config.ts" - } - } + "unit-test": {}, + "int-test": {} }, "tags": ["scope:plugin", "type:feature", "publishable"] } diff --git a/packages/plugin-js-packages/project.json b/packages/plugin-js-packages/project.json index 44de3c7f5..2206bbe99 100644 --- a/packages/plugin-js-packages/project.json +++ b/packages/plugin-js-packages/project.json @@ -25,18 +25,8 @@ ] } }, - "unit-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/plugin-js-packages/vitest.unit.config.ts" - } - }, - "int-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/plugin-js-packages/vitest.int.config.ts" - } - } + "unit-test": {}, + "int-test": {} }, "tags": ["scope:plugin", "type:feature", "publishable"], "description": "A plugin for JavaScript packages." diff --git a/packages/plugin-jsdocs/project.json b/packages/plugin-jsdocs/project.json index 2eb8ef30b..29d28d3fb 100644 --- a/packages/plugin-jsdocs/project.json +++ b/packages/plugin-jsdocs/project.json @@ -25,17 +25,7 @@ ] } }, - "unit-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/plugin-jsdocs/vitest.unit.config.ts" - } - }, - "int-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/plugin-jsdocs/vitest.int.config.ts" - } - } + "unit-test": {}, + "int-test": {} } } diff --git a/packages/plugin-lighthouse/project.json b/packages/plugin-lighthouse/project.json index fb62179c0..3efaeb844 100644 --- a/packages/plugin-lighthouse/project.json +++ b/packages/plugin-lighthouse/project.json @@ -24,18 +24,8 @@ ] } }, - "unit-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/plugin-lighthouse/vitest.unit.config.ts" - } - }, - "int-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/plugin-lighthouse/vitest.int.config.ts" - } - } + "unit-test": {}, + "int-test": {} }, "tags": ["scope:plugin", "type:feature", "publishable"] } diff --git a/packages/plugin-typescript/project.json b/packages/plugin-typescript/project.json index 92da1ecdb..9acbf44e9 100644 --- a/packages/plugin-typescript/project.json +++ b/packages/plugin-typescript/project.json @@ -24,18 +24,8 @@ ] } }, - "unit-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/plugin-typescript/vitest.unit.config.ts" - } - }, - "int-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/plugin-typescript/vitest.int.config.ts" - } - } + "unit-test": {}, + "int-test": {} }, "tags": ["scope:plugin", "type:feature", "publishable"] } diff --git a/packages/utils/project.json b/packages/utils/project.json index ccf3c97f3..09aac5567 100644 --- a/packages/utils/project.json +++ b/packages/utils/project.json @@ -36,18 +36,8 @@ "cwd": "./packages/utils/perf" } }, - "unit-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/utils/vitest.unit.config.ts" - } - }, - "int-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "packages/utils/vitest.int.config.ts" - } - } + "unit-test": {}, + "int-test": {} }, "tags": ["scope:shared", "type:util", "publishable"] } diff --git a/testing/test-setup/project.json b/testing/test-setup/project.json index 613d2436d..63f59dd82 100644 --- a/testing/test-setup/project.json +++ b/testing/test-setup/project.json @@ -14,12 +14,7 @@ "assets": ["testing/test-setup/*.md"] } }, - "unit-test": { - "executor": "@nx/vite:test", - "options": { - "configFile": "testing/test-setup/vitest.unit.config.ts" - } - }, + "unit-test": {}, "lint": { "executor": "@nx/linter:eslint", "outputs": ["{options.outputFile}"],