diff --git a/README.md b/README.md index 82d76e43c..76e0fad86 100644 --- a/README.md +++ b/README.md @@ -493,20 +493,21 @@ For more details on using Nx Release, refer to the [official Nx documentation](h ## Compatibility overview with Nx -| Version | Required Package | -| ------- | ------------------------- | -| v5.8.0 | `@nx/devkit ^22.0.0` | -| v5.7.0 | `@nx/devkit ^21.0.0` | -| v5.5.0 | `@nx/devkit ^20.0.0` | -| v5.3.0 | `@nx/devkit ^19.0.0` | -| v5.0.0 | `@nx/devkit ^18.0.0` | -| v4.0.0 | `@nx/devkit ^17.0.0` | -| v3.0.0 | `@nx/devkit ^16.0.0` | -| v2.28.0 | `@nrwl/devkit ^15.0.0` | -| v2.23.0 | `@nrwl/devkit ^14.0.0` | -| v2.12.0 | `@nrwl/workspace ^13.0.0` | -| v2.4.0 | `@nrwl/workspace ^12.0.0` | -| v1.0.0 | `@nrwl/workspace ^11.0.0` | +| Version | Required Package | +| ------- | --------------------------------- | +| v7.0.0 | `@nx/devkit ^22.0.0 \|\| ^23.0.0` | +| v5.8.0 | `@nx/devkit ^22.0.0` | +| v5.7.0 | `@nx/devkit ^21.0.0` | +| v5.5.0 | `@nx/devkit ^20.0.0` | +| v5.3.0 | `@nx/devkit ^19.0.0` | +| v5.0.0 | `@nx/devkit ^18.0.0` | +| v4.0.0 | `@nx/devkit ^17.0.0` | +| v3.0.0 | `@nx/devkit ^16.0.0` | +| v2.28.0 | `@nrwl/devkit ^15.0.0` | +| v2.23.0 | `@nrwl/devkit ^14.0.0` | +| v2.12.0 | `@nrwl/workspace ^13.0.0` | +| v2.4.0 | `@nrwl/workspace ^12.0.0` | +| v1.0.0 | `@nrwl/workspace ^11.0.0` | ## Changelog diff --git a/packages/semver/package.json b/packages/semver/package.json index e2dd41691..eacd2be84 100644 --- a/packages/semver/package.json +++ b/packages/semver/package.json @@ -13,7 +13,7 @@ "url": "https://github.com/jscutlery/semver" }, "peerDependencies": { - "@nx/devkit": "^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0" + "@nx/devkit": "^22.0.0 || ^23.0.0" }, "dependencies": { "chalk": "4.1.2", diff --git a/packages/semver/src/executors/version/utils/get-project-dependencies.spec.ts b/packages/semver/src/executors/version/utils/get-project-dependencies.spec.ts index 1b1618c68..31cc4b2a6 100644 --- a/packages/semver/src/executors/version/utils/get-project-dependencies.spec.ts +++ b/packages/semver/src/executors/version/utils/get-project-dependencies.spec.ts @@ -13,7 +13,6 @@ jest.mock('@nx/devkit', () => ({ ...jest.requireActual('@nx/devkit'), createProjectGraphAsync: mockCreateProjectGraphAsync, })); -jest.mock('@nx/workspace/src/core/project-graph', () => ({})); const projectGraph: ProjectGraph = { nodes: {}, diff --git a/packages/semver/src/generators/migrate-nx-release/index.spec.ts b/packages/semver/src/generators/migrate-nx-release/index.spec.ts index 051e852f9..62388b742 100644 --- a/packages/semver/src/generators/migrate-nx-release/index.spec.ts +++ b/packages/semver/src/generators/migrate-nx-release/index.spec.ts @@ -125,10 +125,10 @@ describe('Nx Release Migration', () => { release = readNxJson(tree)!.release; } - it('should configure release.releaseTagPattern', async () => { + it('should configure release.releaseTag.pattern', async () => { await setupSemver(); - expect(release!.releaseTagPattern).toBe(`{projectName}-{version}`); + expect(release!.releaseTag?.pattern).toBe(`{projectName}-{version}`); }); it('should configure projects', async () => { diff --git a/packages/semver/src/generators/migrate-nx-release/index.ts b/packages/semver/src/generators/migrate-nx-release/index.ts index 2efb97adc..928773cb3 100644 --- a/packages/semver/src/generators/migrate-nx-release/index.ts +++ b/packages/semver/src/generators/migrate-nx-release/index.ts @@ -185,7 +185,9 @@ function configureNxRelease( const runCmd = pm === 'yarn' ? 'yarn' : pm === 'npm' ? 'npx' : 'pnpm exec'; nxJson.release = { - releaseTagPattern: `${tagPrefix}{version}`, + releaseTag: { + pattern: `${tagPrefix}{version}`, + }, projects: semverProjects.map(([projectName]) => projectName), projectsRelationship: 'independent', version: { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db335880a..1b296ead7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -111,7 +111,7 @@ importers: packages/semver: dependencies: '@nx/devkit': - specifier: ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 + specifier: ^22.0.0 || ^23.0.0 version: 22.6.3(nx@22.7.0(@swc-node/register@1.11.1(@swc/core@1.15.8)(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8)) chalk: specifier: 4.1.2