refactor: revert

Author: Michael Hladky

e2e/nx-plugin-e2e/tests/executor-cli.e2e.test.ts

@@ -27,21 +27,17 @@ async function addTargetToWorkspace(
 ) {
   const { cwd, project } = options;
   const projectCfg = readProjectConfiguration(tree, project);
-  const { root } = projectCfg;
-  const configPath = path.join(root, 'code-pushup.config.ts');
   updateProjectConfiguration(tree, project, {
     ...projectCfg,
     targets: {
       ...projectCfg.targets,
       'code-pushup': {
         executor: '@code-pushup/nx-plugin:cli',
-        options: {
-          config: configPath,
-          ...executorOptions,
-        },
+        ...(executorOptions && { options: executorOptions }),
       },
     },
   });
+  const { root } = projectCfg;
   generateCodePushupConfig(tree, root, {
     plugins: [
       {
@@ -148,7 +144,7 @@ describe('executor command', () => {
     ).resolves.not.toThrow();
   });
 
-  it('should execute print-config executor with upload config', async () => {
+  it('should execute print-config executor with api key', async () => {
     const cwd = path.join(testFileDir, 'execute-print-config-command');
     await addTargetToWorkspace(tree, { cwd, project });
 
@@ -160,9 +156,6 @@ describe('executor command', () => {
         `${project}:code-pushup`,
         'print-config',
         '--upload.apiKey=a123a',
-        '--upload.server=https://example.com',
-        '--upload.organization=test-org',
-        '--upload.project=test-project',
       ],
       cwd,
     });
@@ -233,7 +226,7 @@ describe('executor command', () => {
     expect(cleanStdout).toContain('nx run my-lib:code-pushup collect');
 
     const report = await readJsonFile(
-      path.join(cwd, 'libs', project, '.code-pushup', 'report.json'),
+      path.join(cwd, '.code-pushup', project, 'report.json'),
     );
     expect(report).toStrictEqual(
       expect.objectContaining({

packages/nx-plugin/src/executors/cli/schema.json

@@ -21,13 +21,6 @@
       "type": "string",
       "description": "Path to Code PushUp CLI"
     },
-    "env": {
-      "type": "object",
-      "additionalProperties": {
-        "type": "string"
-      },
-      "description": "Environment variables to pass to the CLI command"
-    },
     "verbose": {
       "type": "boolean",
       "description": "Print additional logs"

packages/nx-plugin/src/executors/cli/utils.unit.test.ts

@@ -107,7 +107,7 @@ describe('parseAutorunExecutorOptions', () => {
     );
 
     expect(osAgnosticPath(executorOptions.persist?.outputDir ?? '')).toBe(
-      osAgnosticPath('{projectRoot}/.code-pushup'),
+      osAgnosticPath('workspaceRoot/.code-pushup/my-app'),
     );
   });
 

packages/nx-plugin/src/executors/internal/config.ts

@@ -23,11 +23,14 @@ export function globalConfig(
 
 export function persistConfig(
   options: Partial<PersistConfig & ProjectExecutorOnlyOptions>,
-  _context: BaseNormalizedExecutorContext,
+  context: BaseNormalizedExecutorContext,
 ): Partial<PersistConfig> {
+  const { projectConfig, workspaceRoot } = context;
+
+  const { name: projectName = '' } = projectConfig ?? {};
   const {
     format,
-    outputDir = '{projectRoot}/.code-pushup',
+    outputDir = path.join(workspaceRoot, '.code-pushup', projectName), // always in <root>/.code-pushup/<project-name>,
     filename,
   } = options;
 

packages/nx-plugin/src/executors/internal/config.unit.test.ts

@@ -143,7 +143,9 @@ describe('persistConfig', () => {
         },
       },
     );
-    expect(String(outputDir)).toBe('{projectRoot}/.code-pushup');
+    expect(osAgnosticPath(String(outputDir))).toBe(
+      osAgnosticPath(`/test/root/workspace-root/.code-pushup/${projectName}`),
+    );
   });
 
   it('should parse given outputDir options', () => {

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

@@ -30,7 +30,6 @@ export type Command =
 export type GlobalExecutorOptions = {
   command?: Command;
   bin?: string;
-  env?: Record<string, string>;
   verbose?: boolean;
   config?: string;
 };

packages/nx-plugin/src/generators/configuration/schema.d.ts

@@ -2,6 +2,7 @@ import type { DynamicTargetOptions } from '../../internal/types.js';
 
 export type ConfigurationGeneratorOptions = {
   project: string;
+  bin?: string;
   skipTarget?: boolean;
   skipConfig?: boolean;
   skipFormat?: boolean;

packages/nx-plugin/src/index.ts

@@ -1,12 +1,20 @@
-import { plugin } from './plugin/index.js';
+import { createNodes, createNodesV2 } from './plugin/index.js';
+
+// default export for nx.json#plugins
+const plugin = {
+  name: '@code-pushup/nx-plugin',
+  createNodesV2,
+  // Keep for backwards compatibility with Nx < 21
+  createNodes,
+};
+
+export default plugin;
 
-export { createNodes, createNodesV2 } from './plugin/index.js';
 export type { AutorunCommandExecutorOptions } from './executors/cli/schema.js';
 export { generateCodePushupConfig } from './generators/configuration/code-pushup-config.js';
 export { configurationGenerator } from './generators/configuration/generator.js';
 export type { ConfigurationGeneratorOptions } from './generators/configuration/schema.js';
 export { initGenerator, initSchematic } from './generators/init/generator.js';
 export { type InitGeneratorSchema } from './generators/init/schema.js';
 export * from './internal/versions.js';
-
-export default plugin;
+export { createNodes, createNodesV2 } from './plugin/index.js';

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

@@ -1,5 +1,4 @@
 export type DynamicTargetOptions = {
   targetName?: string;
   bin?: string;
-  env?: Record<string, string>;
 };

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

@@ -5,31 +5,21 @@ import type { PackageJson } from 'nx/src/utils/package-json';
 const workspaceRoot = path.join(__dirname, '../../');
 const projectsFolder = path.join(__dirname, '../../../');
 
-export const cpNxPluginVersion = readDependencyVersion(workspaceRoot);
-export const cpModelVersion = readDependencyVersion(
+export const cpNxPluginVersion = loadPackageJson(workspaceRoot).version;
+export const cpModelVersion = loadPackageJson(
   path.join(projectsFolder, 'cli'),
-);
-export const cpUtilsVersion = readDependencyVersion(
+).version;
+export const cpUtilsVersion = loadPackageJson(
   path.join(projectsFolder, 'utils'),
-);
-export const cpCliVersion = readDependencyVersion(
+).version;
+export const cpCliVersion = loadPackageJson(
   path.join(projectsFolder, 'models'),
-);
+).version;
 
 /**
- * Load the package.json file from the given folder path and returns the package version.
- * If the version is not given of the package.json file does not exist it returns the fallback value.
+ * Load the package.json file from the given folder path.
+ * @param folderPath
  */
-function readDependencyVersion(
-  folderPath: string,
-  fallbackVersion = 'latest',
-): string {
-  try {
-    return (
-      readJsonFile<PackageJson>(path.join(folderPath, 'package.json'))
-        .version ?? fallbackVersion
-    );
-  } catch {
-    return fallbackVersion;
-  }
+function loadPackageJson(folderPath: string): PackageJson {
+  return readJsonFile<PackageJson>(path.join(folderPath, 'package.json'));
 }