Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
424e05c
chore: [nx migration] checkpoint before running migrations
ChristopherPHolder Oct 23, 2026
3ab04a2
chore: [nx migration] 22-0-0-consolidate-release-tag-config
ChristopherPHolder Oct 23, 2026
43ab306
chore: [nx migration] update-22-2-0
ChristopherPHolder Oct 23, 2026
6943460
chore: [nx migration] convert-jest-config-to-cjs
ChristopherPHolder Oct 23, 2026
3ef70b2
chore: [nx migration] migrate-vitest-to-vitest-package
ChristopherPHolder Oct 23, 2026
c635c1b
chore: [nx migration] 22-6-1-add-claude-worktrees-to-git-ignore
ChristopherPHolder Oct 23, 2026
efb3057
chore: [nx migration] 22-6-0-add-claude-settings-local-to-git-ignore
ChristopherPHolder Oct 23, 2026
c870a78
chore: [nx migration] 22-7-0-add-self-healing-to-gitignore
ChristopherPHolder Oct 23, 2026
d24e070
chore: [nx migration] update-executor-lint-inputs
ChristopherPHolder Oct 23, 2026
1e7b30f
chore: [nx migration] set-ts-jest-isolated-modules
ChristopherPHolder Oct 23, 2026
1da5d76
chore: [nx migration] 23-1-0-add-ignore-deprecations-for-ts6
ChristopherPHolder Oct 23, 2026
09e3522
chore: [nx migration] 24-0-0-enable-legacy-affected
ChristopherPHolder Oct 23, 2026
370a146
chore: [nx migration] remove-deprecated-executors
ChristopherPHolder Oct 23, 2026
6611910
chore: [nx migration] remove-deprecated-executors
ChristopherPHolder Oct 23, 2026
d22c95e
chore: [nx migration] remove-deprecated-executors
ChristopherPHolder Oct 23, 2026
2e3b51e
chore: [nx migration] update-24-0-0-migrate-config-helpers
ChristopherPHolder Oct 23, 2026
f99595d
chore: [nx migration] remove-deprecated-executors
ChristopherPHolder Oct 23, 2026
623bf4c
chore: [nx migration] update-24-0-0-migrate-compose-plugins
ChristopherPHolder Oct 23, 2026
8fdb155
chore: [nx migration] update-24-0-0-add-ready-signal-plugin
ChristopherPHolder Oct 23, 2026
2c611fe
chore: [nx migration] final validation
ChristopherPHolder Oct 23, 2026
30f98c4
chore: remove nx migration artifacts
ChristopherPHolder Oct 23, 2026
0e5620d
fix: run vitest from workspace root and update vitest 4 hooks
ChristopherPHolder Oct 23, 2026
02308aa
chore: drop redundant config from nx migration
ChristopherPHolder Oct 23, 2026
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
11 changes: 2 additions & 9 deletions e2e/cli-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,10 @@
"tags": ["type:e2e"],
"implicitDependencies": ["cli"],
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["e2e/cli-e2e/**/*.ts"]
}
},
"test": {
"executor": "@nx/vite:test",
"options": {
"config": "e2e/cli-e2e/vite.config.e2e.mts"
"cwd": ".",
"args": ["--root", "e2e/cli-e2e"]
}
}
}
Expand Down
10 changes: 6 additions & 4 deletions e2e/cli-e2e/setup.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ function filePath(p: string): string {
return paths.splice(0, paths.length - 1).join();
}

beforeAll((ctx) => {
mkdirSync(join(E2E_DIR, filePath(ctx.name)), { recursive: true });
// eslint-disable-next-line no-empty-pattern
beforeAll(({}, suite) => {
mkdirSync(join(E2E_DIR, filePath(suite.name)), { recursive: true });
});

beforeEach<CliTest>((ctx) => {
Expand Down Expand Up @@ -139,6 +140,7 @@ afterEach<CliTest>((ctx) => {
rmSync(ctx.root, { recursive: true });
});

afterAll((ctx) => {
rmSync(join(E2E_DIR, filePath(ctx.name)), { recursive: true });
// eslint-disable-next-line no-empty-pattern
afterAll(({}, suite) => {
rmSync(join(E2E_DIR, filePath(suite.name)), { recursive: true });
});
11 changes: 7 additions & 4 deletions e2e/cli-e2e/vite.config.e2e.mts → e2e/cli-e2e/vite.config.mts
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
/// <reference types="vitest" />
import { defineConfig } from 'vite';
import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
import { nxReadySignal } from '@nx/vite/plugins/nx-ready-signal.plugin';

export default defineConfig({
resolve: {
tsconfigPaths: true,
},
cacheDir: '../../node_modules/.vite/cli-e2e',

plugins: [nxViteTsPaths()],
plugins: [nxReadySignal()],

test: {
globals: true,
reporters: ['basic'],
reporters: [['default', { summary: false }]],
testTimeout: 30_000,

pool: 'threads',
poolOptions: { threads: { singleThread: true } },
maxWorkers: 1,

environment: 'node',
include: ['tests/**/*.e2e.test.ts'],
Expand Down
2 changes: 1 addition & 1 deletion jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { getJestProjectsAsync } = require('@nx/jest');

export default async () => ({
module.exports = async () => ({
projects: await getJestProjectsAsync(),
});
54 changes: 27 additions & 27 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,31 +33,6 @@
"{workspaceRoot}/eslint.config.mjs"
]
},
"@nx/jest:jest": {
"cache": true,
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
"options": {
"passWithNoTests": true
},
"configurations": {
"ci": {
"ci": true,
"codeCoverage": true
}
}
},
"@nx/vite:test": {
"cache": true,
"inputs": ["default", "^production"]
},
"@nx/eslint:lint": {
"inputs": [
"default",
"{workspaceRoot}/.eslintrc.json",
"{workspaceRoot}/eslint.config.mjs"
],
"cache": true
},
"nx-release-publish": {
"dependsOn": ["build"],
"options": {
Expand All @@ -77,7 +52,6 @@
"release": {
"projects": ["cli", "nx-plugin"],
"projectsRelationship": "independent",
"releaseTagPattern": "{projectName}-{version}",
"changelog": {
"automaticFromRef": true,
"projectChangelogs": {
Expand All @@ -98,6 +72,32 @@
"versionActionsOptions": {
"skipLockFileUpdate": true
}
},
"releaseTag": {
"pattern": "{projectName}-{version}"
}
}
},
"plugins": [
{
"plugin": "@nx/eslint/plugin",
"include": [
"e2e/cli-e2e/**/*",
"packages/cli/**/*",
"packages/nx-plugin/**/*",
"packages/nx-plugin-integration/**/*",
"packages/user-flow-example/**/*"
]
},
{
"plugin": "@nx/jest/plugin",
"include": ["packages/nx-plugin/**/*"]
},
{
"plugin": "@nx/vitest",
"options": {
"testMode": "run"
}
},
"@nx/webpack/plugin"
]
}
Loading
Loading