cherry-pick

Author: BioPhoton

.github/workflows/ci.yml

@@ -122,7 +122,7 @@ jobs:
       - name: E2E test affected projects
         run: npx nx affected -t nxv-e2e --exclude cli-e2e --parallel=1
       - name: E2E test cli-e2e project (due to bugs in the setup it has to run last :( )
-        run: npx nx run cli-e2e:e2e-old
+        run: npx nx run cli-e2e:nxv-e2e
 
   build:
     runs-on: ubuntu-latest

.gitignore

@@ -33,6 +33,8 @@ node_modules
 /connect.lock
 /coverage
 /examples/react-todos-app/coverage
+/examples/react-todos-app/package.json
+/examples/react-todos-app/package-lock.json
 /libpeerconnection.log
 npm-debug.log
 yarn-error.log

e2e/cli-e2e/project.json

@@ -11,17 +11,20 @@
         "lintFilePatterns": ["e2e/cli-e2e/**/*.ts"]
       }
     },
+    "nxv-env-setup": {
+      "options": {
+        "environmentRoot": "examples/react-todos-app"
+      }
+    },
     "e2e-old": {
       "executor": "@nx/vite:test",
       "options": {
-        "configFile": "e2e/cli-e2e/vite.config.e2e.ts"
+        "configFile": "e2e/cli-e2e/vite.config.e2e.ts",
+        "environmentRoot": "examples/react-todos-app"
       }
     }
   },
   "implicitDependencies": [
-    "models",
-    "utils",
-    "core",
     "cli",
     "plugin-eslint",
     "plugin-coverage",

e2e/cli-e2e/tests/collect.e2e.test.ts

@@ -51,8 +51,13 @@ describe('CLI collect', () => {
 
   it('should run ESLint plugin and create report.json', async () => {
     const { code, stderr } = await executeProcess({
-      command: 'code-pushup',
-      args: ['collect', '--no-progress', '--onlyPlugins=eslint'],
+      command: 'npx',
+      args: [
+        '@code-pushup/cli',
+        'collect',
+        '--no-progress',
+        '--onlyPlugins=eslint',
+      ],
       cwd: 'examples/react-todos-app',
     });
 
@@ -83,14 +88,16 @@ describe('CLI collect', () => {
     );
 
     const { code, stderr } = await executeProcess({
-      command: 'code-pushup',
+      command: 'npx',
       args: [
+        '@code-pushup/cli',
         'collect',
         '--no-progress',
         `--config=${configPath}`,
         '--persist.outputDir=tmp/e2e',
         '--onlyPlugins=coverage',
       ],
+      cwd: 'examples/react-todos-app',
     });
 
     expect(code).toBe(0);
@@ -104,8 +111,13 @@ describe('CLI collect', () => {
 
   it('should run Code coverage plugin that runs coverage tool and creates report.json', async () => {
     const { code, stderr } = await executeProcess({
-      command: 'code-pushup',
-      args: ['collect', '--no-progress', '--onlyPlugins=coverage'],
+      command: 'npx',
+      args: [
+        '@code-pushup/cli',
+        'collect',
+        '--no-progress',
+        '--onlyPlugins=coverage',
+      ],
       cwd: 'examples/react-todos-app',
     });
 
@@ -120,8 +132,13 @@ describe('CLI collect', () => {
 
   it('should create report.md', async () => {
     const { code, stderr } = await executeProcess({
-      command: 'code-pushup',
-      args: ['collect', '--persist.format=md', '--no-progress'],
+      command: 'npx',
+      args: [
+        '@code-pushup/cli',
+        'collect',
+        '--persist.format=md',
+        '--no-progress',
+      ],
       cwd: 'examples/react-todos-app',
     });
 
@@ -137,8 +154,8 @@ describe('CLI collect', () => {
 
   it('should print report summary to stdout', async () => {
     const { code, stdout, stderr } = await executeProcess({
-      command: 'code-pushup',
-      args: ['collect', '--no-progress'],
+      command: 'npx',
+      args: ['@code-pushup/cli', 'collect', '--no-progress'],
       cwd: 'examples/react-todos-app',
     });
 

e2e/cli-e2e/tests/compare.e2e.test.ts

@@ -14,8 +14,9 @@ describe('CLI compare', () => {
     }
     await cleanTestFolder('tmp/e2e/react-todos-app');
     await executeProcess({
-      command: 'code-pushup',
+      command: 'npx',
       args: [
+        '@code-pushup/cli',
         'collect',
         '--persist.filename=source-report',
         '--onlyPlugins=eslint',
@@ -28,8 +29,9 @@ describe('CLI compare', () => {
       cwd: 'examples/react-todos-app',
     });
     await executeProcess({
-      command: 'code-pushup',
+      command: 'npx',
       args: [
+        '@code-pushup/cli',
         'collect',
         '--persist.filename=target-report',
         '--onlyPlugins=eslint',
@@ -45,8 +47,9 @@ describe('CLI compare', () => {
 
   it('should compare report.json files and create report-diff.json and report-diff.md', async () => {
     await executeProcess({
-      command: 'code-pushup',
+      command: 'npx',
       args: [
+        '@code-pushup/cli',
         'compare',
         '--before=../../tmp/e2e/react-todos-app/source-report.json',
         '--after=../../tmp/e2e/react-todos-app/target-report.json',

e2e/cli-e2e/tests/help.e2e.test.ts

@@ -4,8 +4,9 @@ import { executeProcess } from '@code-pushup/utils';
 describe('CLI help', () => {
   it('should print help with help command', async () => {
     const { code, stdout, stderr } = await executeProcess({
-      command: 'code-pushup',
-      args: ['help'],
+      command: 'npx',
+      args: ['@code-pushup/cli', 'help'],
+      cwd: 'examples/react-todos-app',
     });
     expect(code).toBe(0);
     expect(stderr).toBe('');
@@ -14,12 +15,14 @@ describe('CLI help', () => {
 
   it('should produce the same output to stdout for both help argument and help command', async () => {
     const helpArgResult = await executeProcess({
-      command: 'code-pushup',
-      args: ['help'],
+      command: 'npx',
+      args: ['@code-pushup/cli', 'help'],
+      cwd: 'examples/react-todos-app',
     });
     const helpCommandResult = await executeProcess({
-      command: 'code-pushup',
-      args: ['--help'],
+      command: 'npx',
+      args: ['@code-pushup/cli', '--help'],
+      cwd: 'examples/react-todos-app',
     });
     expect(helpArgResult.code).toBe(0);
     expect(helpCommandResult.code).toBe(0);

e2e/cli-e2e/tests/print-config.e2e.test.ts

@@ -6,49 +6,45 @@ const extensions = ['js', 'mjs', 'ts'] as const;
 export const configFilePath = (ext: (typeof extensions)[number]) =>
   join(process.cwd(), `e2e/cli-e2e/mocks/fixtures/code-pushup.config.${ext}`);
 
-describe('print-config', () => {
+describe('CLI print-config', () => {
   it.each(extensions)(
     'should load .%s config file with correct arguments',
     async ext => {
       const { code, stdout } = await executeProcess({
-        command: 'code-pushup',
+        command: 'npx',
         args: [
+          '@code-pushup/cli',
           'print-config',
           '--no-progress',
-          `--config=${configFilePath(ext)}`,
           '--tsconfig=tsconfig.base.json',
           '--persist.outputDir=output-dir',
           '--persist.format=md',
           `--persist.filename=${ext}-report`,
           '--onlyPlugins=coverage',
         ],
+        cwd: 'examples/react-todos-app',
       });
 
       expect(code).toBe(0);
 
       expect(JSON.parse(stdout)).toEqual(
         expect.objectContaining({
-          config: expect.stringContaining(`code-pushup.config.${ext}`),
           tsconfig: 'tsconfig.base.json',
           // filled by command options
           persist: {
             outputDir: 'output-dir',
             filename: `${ext}-report`,
             format: ['md'],
           },
-          upload: {
-            organization: 'code-pushup',
-            project: `cli-${ext}`,
-            apiKey: 'e2e-api-key',
-            server: 'https://e2e.com/api',
-          },
-          plugins: [
+          plugins: expect.arrayContaining([
             expect.objectContaining({
               slug: 'coverage',
               title: 'Code coverage',
             }),
-          ],
-          categories: [expect.objectContaining({ slug: 'code-coverage' })],
+          ]),
+          categories: expect.arrayContaining([
+            expect.objectContaining({ slug: 'code-coverage' }),
+          ]),
           onlyPlugins: ['coverage'],
         }),
       );

e2e/cli-e2e/vite.config.e2e.ts

@@ -16,7 +16,6 @@ export default defineConfig({
     },
     environment: 'node',
     include: ['tests/**/*.e2e.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    globalSetup: ['../../global-setup.e2e.ts'],
     setupFiles: ['../../testing/test-setup/src/lib/reset.mocks.ts'],
   },
 });

examples/react-todos-app/.eslintrc.js

@@ -0,0 +1,64 @@
+{
+  "root": true,
+  "env": {
+    "browser": true,
+    "es2021": true
+  },
+  "plugins": ["react", "react-hooks"],
+  "overrides": [
+    {
+      "env": {
+        "node": true
+      },
+      "files": [".eslintrc.{js,cjs}"],
+      "parserOptions": {
+        "sourceType": "script"
+      }
+    }
+  ],
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "jsx": true
+    }
+  },
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
+  },
+  "rules": {
+    "no-cond-assign": "warn",
+    "no-const-assign": "warn",
+    "no-debugger": "warn",
+    "no-invalid-regexp": "warn",
+    "no-undef": "warn",
+    "no-unreachable-loop": "warn",
+    "no-unsafe-negation": "warn",
+    "no-unsafe-optional-chaining": "warn",
+    "no-unused-vars": "warn",
+    "use-isnan": "warn",
+    "valid-typeof": "warn",
+    "arrow-body-style": "warn",
+    "camelcase": "warn",
+    "curly": "warn",
+    "eqeqeq": "warn",
+    "max-lines-per-function": "warn",
+    "max-lines": "warn",
+    "no-shadow": "warn",
+    "no-var": "warn",
+    "object-shorthand": "warn",
+    "prefer-arrow-callback": "warn",
+    "prefer-const": "warn",
+    "prefer-object-spread": "warn",
+    "yoda": "warn",
+    "react/jsx-key": "warn",
+    "react/prop-types": "warn",
+    "react/react-in-jsx-scope": "warn",
+    "react/jsx-uses-vars": "warn",
+    "react/jsx-uses-react": "error",
+    "react-hooks/rules-of-hooks": "error",
+    "react-hooks/exhaustive-deps": "warn"
+  }
+}