feat: mvp

Author: aramirezj

e2e/nx-plugin-e2e/tests/plugin-create-nodes.e2e.test.ts

@@ -14,7 +14,6 @@ import {
   E2E_ENVIRONMENTS_DIR,
   TEST_OUTPUT_DIR,
   removeColorCodes,
-  teardownTestFolder,
 } from '@code-pushup/test-utils';
 import { executeProcess, readTextFile } from '@code-pushup/utils';
 import { INLINE_PLUGIN } from './inline-plugin.js';
@@ -35,7 +34,7 @@ describe('nx-plugin', () => {
   });
 
   afterEach(async () => {
-    await teardownTestFolder(testFileDir);
+    // await teardownTestFolder(testFileDir);
   });
 
   it('should add configuration target dynamically', async () => {

nx.json

@@ -94,6 +94,9 @@
           "filterByTags": ["publishable"]
         }
       }
+    },
+    {
+      "plugin": "./packages/nx-plugin/src/plugin/plugin.ts"
     }
   ]
 }

packages/nx-plugin/src/plugin/plugin.ts

@@ -1,14 +1,17 @@
-import type {
+import {
   CreateNodes,
   CreateNodesContext,
   CreateNodesResult,
+  CreateNodesV2,
+  createNodesFromFiles,
 } from '@nx/devkit';
-import { PROJECT_JSON_FILE_NAME } from '../internal/constants.js';
-import { createTargets } from './target/targets.js';
-import type { CreateNodesOptions } from './types.js';
-import { normalizedCreateNodesContext } from './utils.js';
+import { PROJECT_JSON_FILE_NAME } from '../internal/constants';
+import { createTargets } from './target/targets';
+import type { CreateNodesOptions } from './types';
+import { normalizedCreateNodesContext } from './utils';
 
 // name has to be "createNodes" to get picked up by Nx
+
 export const createNodes: CreateNodes = [
   `**/${PROJECT_JSON_FILE_NAME}`,
   async (
@@ -32,3 +35,31 @@ export const createNodes: CreateNodes = [
     };
   },
 ];
+
+export const createNodesV2: CreateNodesV2<any> = [
+  `**/${PROJECT_JSON_FILE_NAME}`,
+
+  async (configFiles, options, context) => {
+    return await createNodesFromFiles(
+      async (globMatchingFile, internalOptions) => {
+        const parsedCreateNodesOptions = internalOptions as CreateNodesOptions;
+
+        const normalizedContext = await normalizedCreateNodesContext(
+          context,
+          globMatchingFile,
+          parsedCreateNodesOptions,
+        );
+        return {
+          projects: {
+            [normalizedContext.projectRoot]: {
+              targets: await createTargets(normalizedContext),
+            },
+          },
+        };
+      },
+      configFiles,
+      options,
+      context,
+    );
+  },
+];

packages/nx-plugin/src/plugin/target/configuration-target.ts

@@ -1,8 +1,8 @@
 import type { TargetConfiguration } from '@nx/devkit';
 import type { RunCommandsOptions } from 'nx/src/executors/run-commands/run-commands.impl';
-import { objectToCliArgs } from '../../executors/internal/cli.js';
-import { PACKAGE_NAME } from '../../internal/constants.js';
-import { CP_TARGET_NAME } from '../constants.js';
+import { objectToCliArgs } from '../../executors/internal/cli';
+import { PACKAGE_NAME } from '../../internal/constants';
+import { CP_TARGET_NAME } from '../constants';
 
 export function createConfigurationTarget(options?: {
   targetName?: string;

packages/nx-plugin/src/plugin/target/executor-target.ts

@@ -1,6 +1,6 @@
 import type { TargetConfiguration } from '@nx/devkit';
-import { PACKAGE_NAME } from '../../internal/constants.js';
-import type { ProjectPrefixOptions } from '../types.js';
+import { PACKAGE_NAME } from '../../internal/constants';
+import type { ProjectPrefixOptions } from '../types';
 
 export function createExecutorTarget(options?: {
   bin?: string;

packages/nx-plugin/src/plugin/target/targets.ts

@@ -1,9 +1,9 @@
 import { readdir } from 'node:fs/promises';
-import { CP_TARGET_NAME } from '../constants.js';
-import type { NormalizedCreateNodesContext } from '../types.js';
-import { createConfigurationTarget } from './configuration-target.js';
-import { CODE_PUSHUP_CONFIG_REGEX } from './constants.js';
-import { createExecutorTarget } from './executor-target.js';
+import { CP_TARGET_NAME } from '../constants';
+import type { NormalizedCreateNodesContext } from '../types';
+import { createConfigurationTarget } from './configuration-target';
+import { CODE_PUSHUP_CONFIG_REGEX } from './constants';
+import { createExecutorTarget } from './executor-target';
 
 export async function createTargets(
   normalizedContext: NormalizedCreateNodesContext,

packages/nx-plugin/src/plugin/types.ts

@@ -1,6 +1,10 @@
-import type { CreateNodesContext, ProjectConfiguration } from '@nx/devkit';
+import type {
+  CreateNodesContext,
+  CreateNodesContextV2,
+  ProjectConfiguration,
+} from '@nx/devkit';
 import type { WithRequired } from '@code-pushup/utils';
-import type { DynamicTargetOptions } from '../internal/types.js';
+import type { DynamicTargetOptions } from '../internal/types';
 
 export type ProjectPrefixOptions = {
   projectPrefix?: string;
@@ -13,7 +17,16 @@ export type ProjectConfigurationWithName = WithRequired<
   'name'
 >;
 
-export type NormalizedCreateNodesContext = CreateNodesContext & {
+export type NormalizedCreateNodesContext = (
+  | CreateNodesContext
+  | CreateNodesContextV2
+) & {
+  projectJson: ProjectConfigurationWithName;
+  projectRoot: string;
+  createOptions: CreateNodesOptions;
+};
+
+export type NormalizedCreateNodesContextV2 = CreateNodesContextV2 & {
   projectJson: ProjectConfigurationWithName;
   projectRoot: string;
   createOptions: CreateNodesOptions;

packages/nx-plugin/src/plugin/utils.ts

@@ -1,15 +1,15 @@
-import type { CreateNodesContext } from '@nx/devkit';
+import type { CreateNodesContext, CreateNodesContextV2 } from '@nx/devkit';
 import { readFile } from 'node:fs/promises';
 import * as path from 'node:path';
-import { CP_TARGET_NAME } from './constants.js';
+import { CP_TARGET_NAME } from './constants';
 import type {
   CreateNodesOptions,
   NormalizedCreateNodesContext,
   ProjectConfigurationWithName,
 } from './types.js';
 
 export async function normalizedCreateNodesContext(
-  context: CreateNodesContext,
+  context: CreateNodesContext | CreateNodesContextV2,
   projectConfigurationFile: string,
   createOptions: CreateNodesOptions = {},
 ): Promise<NormalizedCreateNodesContext> {