fix create-cli e2e

Author: BioPhoton

e2e/create-cli-e2e/tests/init.e2e.test.ts

@@ -1,9 +1,9 @@
+import { dirname } from 'knip/dist/util/path';
 import { join, relative } from 'node:path';
 import { afterEach, expect } from 'vitest';
 import { teardownTestFolder } from '@code-pushup/test-setup';
-import { removeColorCodes } from '@code-pushup/test-utils';
+import { createNpmWorkspace, removeColorCodes } from '@code-pushup/test-utils';
 import { executeProcess, readJsonFile, readTextFile } from '@code-pushup/utils';
-import { createNpmWorkspace } from '../mocks/create-npm-workshpace';
 
 describe('create-cli-inti', () => {
   const workspaceRoot = 'tmp/e2e/create-cli-e2e';
@@ -19,7 +19,12 @@ describe('create-cli-inti', () => {
     await createNpmWorkspace(cwd);
     const { code, stdout } = await executeProcess({
       command: 'npm',
-      args: ['exec', '@code-pushup/create-cli', `--userconfig=${userconfig}`],
+      args: [
+        'exec',
+        '@code-pushup/create-cli',
+        `--userconfig=${userconfig}`,
+        `--prefix=${dirname(userconfig)}`,
+      ],
       cwd,
     });
 
@@ -48,16 +53,20 @@ describe('create-cli-inti', () => {
     );
   });
 
-  // eslint-disable-next-line vitest/no-disabled-tests
-  it.skip('should execute package correctly over npm init', async () => {
+  it('should execute package correctly over npm init', async () => {
     const cwd = join(baseDir, 'npm-init');
     const userconfig = relative(cwd, join(workspaceRoot, '.npmrc'));
 
     await createNpmWorkspace(cwd);
 
     const { code, stdout } = await executeProcess({
       command: 'npm',
-      args: ['init', '@code-pushup/cli', `--userconfig=${userconfig}`],
+      args: [
+        'init',
+        '@code-pushup/cli',
+        `--userconfig=${userconfig}`,
+        `--prefix=${dirname(userconfig)}`,
+      ],
       cwd,
     });
 
@@ -94,7 +103,12 @@ describe('create-cli-inti', () => {
 
     await executeProcess({
       command: 'npm',
-      args: ['init', '@code-pushup/cli', `--userconfig=${userconfig}`],
+      args: [
+        'init',
+        '@code-pushup/cli',
+        `--userconfig=${userconfig}`,
+        `--prefix=${dirname(userconfig)}`,
+      ],
       cwd,
     });
 

global-setup.verdaccio.ts

@@ -12,9 +12,15 @@ const projectName = process.env['NX_TASK_TARGET_PROJECT'];
 export async function setup() {
   await globalSetup();
 
-  activeRegistry = await nxStartVerdaccioAndSetupEnv({
-    projectName,
-  });
+  try {
+    activeRegistry = await nxStartVerdaccioAndSetupEnv({
+      projectName: projectName,
+      verbose: true,
+    });
+  } catch (error) {
+    console.error('Error starting local verdaccio registry:\n' + error.message);
+    throw error;
+  }
 
   const { userconfig, workspaceRoot } = activeRegistry;
   await executeProcess({
@@ -32,7 +38,6 @@ export async function setup() {
 export async function teardown() {
   // NOTICE - Time saving optimization
   // We skip uninstalling packages as the folder is deleted anyway
-
   // comment out to see the folder and web interface
-  await nxStopVerdaccioAndTeardownEnv(activeRegistry);
+  // await nxStopVerdaccioAndTeardownEnv(activeRegistry);
 }

testing/test-setup/src/lib/test-folder.setup.ts

@@ -13,7 +13,6 @@ export async function cleanTestFolder(dirName: string) {
 
 export async function teardownTestFolder(dirName: string) {
   try {
-    // eslint-disable-next-line no-magic-numbers
     await rm(dirName, {
       recursive: true,
       force: true,

testing/test-utils/src/index.ts

@@ -6,8 +6,8 @@ export * from './lib/utils/env';
 export * from './lib/utils/git';
 export * from './lib/utils/string';
 export * from './lib/utils/file-system';
-export * from './lib/utils/omit-report-data';
 export * from './lib/utils/create-npm-workshpace';
+export * from './lib/utils/omit-report-data';
 
 // static mocks
 export * from './lib/utils/commit.mock';

tools/src/debug/utils.ts

@@ -97,7 +97,7 @@ export function listProcess({ pid, commandMatch }: ProcessListOption = {}): {
 export function killProcessPid(pid: number | string, command?: string): void {
   const commandString = command ? `, command: ${command}` : '';
   try {
-    // sometimes pid is NaN
+    // @TODO sometimes pid is NaN, figure out if this is caused by trying to kill a process that is already stopped
     if (Number.isNaN(Number(pid))) {
       console.info(
         `Can't kill process as pid is not a number. \nPID: ${pid} for command ${commandString}`,

tools/src/npm/npm.plugin.ts

@@ -75,5 +75,25 @@ function npmTargets({
     'npm-uninstall': {
       command: `npm uninstall ${packageName} --prefix={args.prefix} --userconfig={args.userconfig}`,
     },
+    'npm-install-e2e': {
+      dependsOn: [
+        {
+          target: 'publish-e2e',
+          projects: 'self',
+          params: 'forward',
+        },
+        {
+          target: 'npm-install-e2e',
+          projects: 'dependencies',
+          params: 'forward',
+        },
+        {
+          target: 'publish-e2e',
+          projects: 'dependencies',
+          params: 'forward',
+        },
+      ],
+      command: `npm install -D --no-fund ${packageName}@{args.pkgVersion} --prefix={args.prefix} --userconfig={args.userconfig}`,
+    },
   };
 }

tools/src/publish/publish.plugin.ts

@@ -73,7 +73,21 @@ function publishTargets({
 }) {
   return {
     publish: {
-      dependsOn: ['build'],
+      command: `tsx --tsconfig={args.tsconfig} {args.script} --projectName=${projectName} --directory=${directory} --registry={args.registry} --userconfig={args.userconfig} --nextVersion={args.nextVersion} --tag={args.tag} --verbose=${verbose}`,
+      options: {
+        script: publishScript,
+        tsconfig,
+      },
+    },
+    'publish-e2e': {
+      dependsOn: [
+        'build',
+        {
+          target: 'publish-e2e',
+          projects: 'dependencies',
+          params: 'forward',
+        },
+      ],
       command: `tsx --tsconfig={args.tsconfig} {args.script} --projectName=${projectName} --directory=${directory} --registry={args.registry} --userconfig={args.userconfig} --nextVersion={args.nextVersion} --tag={args.tag} --verbose=${verbose}`,
       options: {
         script: publishScript,