refactor(semver): 🛠 get rid of deprecated workspace def

Author: edbzn

packages/semver/src/executors/version/index.ts

@@ -17,7 +17,7 @@ import { _logStep } from './utils/logger';
 import { runPostTargets } from './utils/post-target';
 import { formatTag, formatTagPrefix } from './utils/tag';
 import { tryBump } from './utils/try-bump';
-import { getProjectRoot } from './utils/workspace';
+import { getProject } from './utils/workspace';
 import {
   versionProject,
   versionWorkspace,
@@ -76,7 +76,7 @@ export default async function version(
     projectName,
     syncVersions,
   });
-  const projectRoot = getProjectRoot(context);
+  const projectRoot = getProject(context).root;
   const newVersion$ = tryBump({
     preset,
     projectRoot,
@@ -132,7 +132,7 @@ export default async function version(
         commitMessage,
         dependencyUpdates,
         skipCommit,
-        workspace: context.workspace,
+        workspace: context.projectsConfigurations,
       };
 
       const version$ = defer(() =>

packages/semver/src/executors/version/testing.ts

@@ -4,7 +4,7 @@ import * as rimraf from 'rimraf';
 import * as tmp from 'tmp';
 import { promisify } from 'util';
 
-import type {
+import {
   ExecutorContext,
   ProjectConfiguration,
   TargetConfiguration,
@@ -68,10 +68,11 @@ export function createFakeContext({
   }[];
 }): ExecutorContext {
   return {
+    isVerbose: false,
     cwd: cwd,
     root: workspaceRoot,
     projectName: project,
-    workspace: {
+    projectsConfigurations: {
       version: 2,
       projects: {
         [project]: {
@@ -81,7 +82,7 @@ export function createFakeContext({
         ...assembleAdditionalProjects(additionalProjects),
       },
     },
-  } as ExecutorContext;
+  } satisfies ExecutorContext;
 }
 
 function assembleAdditionalProjects(
@@ -91,11 +92,13 @@ function assembleAdditionalProjects(
     targets?: Record<string, TargetConfiguration>;
   }[]
 ) {
-  return additionalProjects.reduce((acc, p) => {
+  return additionalProjects.reduce<{
+    [projectName: string]: ProjectConfiguration;
+  }>((acc, p) => {
     acc[p.project] = {
       root: p.projectRoot,
       targets: p.targets || {},
     };
     return acc;
-  }, {} as { [project: string]: ProjectConfiguration });
+  }, {} satisfies { [project: string]: ProjectConfiguration });
 }

packages/semver/src/executors/version/utils/get-project-dependencies.ts

@@ -20,7 +20,8 @@ export async function getDependencyRoots({
     // Include any depended-upon libraries in determining the version bump.
     return (await getProjectDependencies(projectName)).map((name) => ({
       name,
-      path: context.workspace.projects[name].root,
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      path: context.projectsConfigurations!.projects[name].root,
     }));
   }
 

packages/semver/src/executors/version/utils/post-target.ts

@@ -73,14 +73,14 @@ export function _getTargetOptions({
     (optionsAccumulator, [option, value]) => {
       const resolvedValue = Array.isArray(value)
         ? value.map((_element) =>
-            typeof _element !== "object"
-            ? coerce(
-                createTemplateString(
-                  (_element as number | string | boolean).toString(),
-                  context
+            typeof _element !== 'object'
+              ? coerce(
+                  createTemplateString(
+                    (_element as number | string | boolean).toString(),
+                    context
+                  )
                 )
-              )
-            : _getTargetOptions({ options: _element, context })
+              : _getTargetOptions({ options: _element, context })
           )
         : typeof value === 'object'
         ? _getTargetOptions({
@@ -105,14 +105,14 @@ export function _getTargetOptions({
 
 /* istanbul ignore next */
 export function _checkTargetExist(target: Target, context: ExecutorContext) {
-  const project = context.workspace.projects[target.project];
+  const project = context.projectsConfigurations?.projects?.[target.project];
 
   if (project === undefined) {
     throw new Error(
       `The target project "${
         target.project
       }" does not exist in your workspace. Available projects: ${Object.keys(
-        context.workspace.projects
+        context.projectsConfigurations?.projects ?? []
       ).map((project) => `"${project}"`)}.`
     );
   }

packages/semver/src/executors/version/utils/workspace.ts

@@ -1,21 +1,34 @@
 import type {
   ExecutorContext,
-  NxJsonConfiguration,
+  ProjectConfiguration,
   ProjectsConfigurations,
 } from '@nrwl/devkit';
 import { resolve } from 'path';
 
 /* istanbul ignore next */
-export function getProjectRoot(context: ExecutorContext): string {
-  return context.workspace.projects[context.projectName as string].root;
+export function getProject(context: ExecutorContext): ProjectConfiguration {
+  const project =
+    context.projectsConfigurations?.projects[context.projectName as string];
+
+  if (!project) {
+    throw new Error(`Project root not found for ${context.projectName}`);
+  }
+
+  return project;
 }
 
 /* istanbul ignore next */
 export function getProjectRoots(
   workspaceRoot: string,
-  workspace: ProjectsConfigurations & NxJsonConfiguration<string[] | '*'>
+  workspace: ProjectsConfigurations | undefined
 ): string[] {
-  return Object.values(workspace.projects).map((project) =>
+  const projects = Object.values(workspace?.projects ?? {});
+
+  if (projects.length === 0) {
+    throw new Error('No projects found in workspace');
+  }
+
+  return projects.map((project) =>
     typeof project === 'string'
       ? resolve(workspaceRoot, project)
       : resolve(workspaceRoot, project.root)

packages/semver/src/executors/version/version.ts

@@ -1,6 +1,7 @@
-import { NxJsonConfiguration, ProjectsConfigurations } from '@nrwl/devkit';
+import { ProjectsConfigurations } from '@nrwl/devkit';
 import { forkJoin, Observable, of } from 'rxjs';
 import { concatMap, map } from 'rxjs/operators';
+import { Preset } from './schema';
 import {
   insertChangelogDependencyUpdates,
   updateChangelog,
@@ -10,7 +11,6 @@ import { addToStage, createTag, getLastCommitHash } from './utils/git';
 import { logStep } from './utils/logger';
 import { updatePackageJson } from './utils/project';
 import { getProjectRoots } from './utils/workspace';
-import { Preset } from './schema';
 
 export type Version =
   | {
@@ -38,7 +38,7 @@ export interface CommonVersionOptions {
   skipProjectChangelog: boolean;
   dependencyUpdates: Version[];
   preset: Preset;
-  workspace: ProjectsConfigurations & NxJsonConfiguration<string[] | '*'>;
+  workspace: ProjectsConfigurations | undefined;
 }
 
 export function versionWorkspace({