Merge branch 'main' into suvij/eng-6412-add-an-option-for-the-user-to-configure-the-number-of-cache

Author: JivusAyrus

.github/workflows/cli-binary-pr.yaml

@@ -1,10 +1,10 @@
-name: Cli CI
+name: wgc CI
 on:
   pull_request:
     paths:
-      - "cli/**/*"
-      - "connect/**/*"
-      - ".github/workflows/cli-ci.yaml"
+      - 'cli/**/*'
+      - 'connect/**/*'
+      - '.github/workflows/cli-ci.yaml'
 
 concurrency:
   group: ${{github.workflow}}-${{github.head_ref}}
@@ -15,25 +15,105 @@ env:
   DO_NOT_TRACK: '1'
 
 jobs:
-  build_test:
+  build_test_default:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
       - uses: ./.github/actions/node
+      - uses: oven-sh/setup-bun@v2
 
       - name: Install dependencies
-        run: pnpm install --frozen-lockfile
+        run: pnpm --filter ./cli --filter ./connect --filter ./shared --filter ./composition install --frozen-lockfile
 
       - name: Generate code
         run: pnpm buf generate --template buf.ts.gen.yaml
 
       - name: Check if git is not dirty after generating files
         run: git diff --no-ext-diff --exit-code
 
-      - name: Build
-        run: pnpm run --filter ./cli --filter ./connect --filter ./shared --filter ./composition build
+      - name: Build Node.js NPM Package
+        run: pnpm --filter ./cli --filter ./connect --filter ./shared --filter ./composition run build
+
+      - name: 'Build wgc binary'
+        working-directory: cli
+        run: bun build --compile --minify --sourcemap src/index.ts --outfile wgc
+
+      - name: E2E test
+        working-directory: cli
+        run: bun test e2e
+
+  build_test_node_matrix:
+    timeout-minutes: 10
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: ['20.x', '22.x']
+
+    steps:
+      - uses: actions/checkout@v4
 
-      - name: Test
+      - uses: ./.github/actions/node
+        with:
+          node-version: ${{ matrix.node-version }}
+      - uses: oven-sh/setup-bun@v2
+
+      - name: Install dependencies
+        run: pnpm --filter ./cli --filter ./connect --filter ./shared --filter ./composition install --frozen-lockfile
+
+      - name: Build Node.js NPM Package
+        run: pnpm --filter ./cli --filter ./connect --filter ./shared --filter ./composition run build
+
+      - name: Unit Test
         run: pnpm run --filter wgc test
+
+      - name: E2E test (node)
+        working-directory: cli
+        run: bun test e2e --test-name-pattern node
+
+  build_bun_matrix:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+
+    strategy:
+      matrix:
+        target: [bun-linux-x64, bun-linux-arm64, bun-darwin-x64, bun-darwin-arm64, bun-windows-x64]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - uses: oven-sh/setup-bun@v2
+
+      - uses: ./.github/actions/node
+
+      - name: Install dependencies
+        run: pnpm --filter ./cli --filter ./connect --filter ./shared --filter ./composition install --frozen-lockfile
+
+      - name: Build
+        run: pnpm --filter ./cli --filter ./connect --filter ./shared --filter ./composition run build
+
+      - name: 'Build wgc binary'
+        working-directory: cli
+        run: bun build --compile --minify --sourcemap --target ${{ matrix.target }} src/index.ts --outfile out/wgc-experimental-${{ github.sha }}-${{ matrix.target }}
+
+      - name: 'Upload builds as artifacts'
+        uses: actions/upload-artifact@v4
+        with:
+          name: wgc-experimental-${{ github.sha }}-${{ matrix.target }}
+          path: cli/out/wgc-experimental-${{ github.sha }}-${{ matrix.target }}*
+          if-no-files-found: error
+
+  build_test:
+    runs-on: ubuntu-latest
+    needs: [build_test_default, build_test_node_matrix, build_bun_matrix]
+    if: always()
+    steps:
+      - name: 'All tests passed'
+        if: ${{ !(contains(needs.*.result, 'failure')) }}
+        run: exit 0
+      - name: 'Some tests failed'
+        if: ${{ contains(needs.*.result, 'failure') }}
+        run: exit 1

.github/workflows/cli-ci.yaml

@@ -0,0 +1,39 @@
+import { existsSync } from 'node:fs';
+import { expect, test, describe } from 'bun:test';
+import { $ } from 'bun';
+
+import packageJSON from '../package.json' with { type: 'json' };
+
+$.nothrow();
+
+describe('Bun CLI', () => {
+  const binPath = './wgc';
+
+  test('bun cli should exist', () => {
+    expect(existsSync(binPath)).toBe(true);
+  });
+
+  test('bun cli should output the correct version', async () => {
+    const { stdout, stderr, exitCode } = await $`${binPath} -V`.quiet();
+
+    expect(exitCode, `exited with non-zero:\nstdout:\n${stdout.toString()}\n\nstderr:\n${stderr.toString()}`).toBe(0);
+
+    expect(stdout.toString()).toBe(packageJSON.version + '\n');
+  });
+});
+
+describe('Node CLI', () => {
+  const binPath = packageJSON.bin;
+
+  test('node cli should exist', () => {
+    expect(existsSync(binPath)).toBe(true);
+  });
+
+  test('node cli should output the correct version', async () => {
+    const { stdout, stderr, exitCode } = await $`node ${binPath} -V`.quiet();
+
+    expect(exitCode, `exited with non-zero:\nstdout:\n${stdout.toString()}\n\nstderr:\n${stderr.toString()}`).toBe(0);
+
+    expect(stdout.toString()).toBe(packageJSON.version + '\n');
+  });
+});

cli/e2e/smoke.test.ts

@@ -22,10 +22,11 @@
     "build": "del dist && tsc",
     "build:bun": "bun build --compile src/index.ts --outfile wgc",
     "wgc": "tsx --env-file .env src/index.ts",
-    "test": "pnpm lint && vitest run",
+    "test": "pnpm lint && vitest run test/",
     "coverage": "vitest run --coverage",
     "lint": "eslint --cache --ext .ts,.mjs,.cjs . && prettier -c src",
-    "lint:fix": "eslint --cache --fix --ext .ts,.mjs,.cjs . && prettier --write -c src"
+    "lint:fix": "eslint --cache --fix --ext .ts,.mjs,.cjs . && prettier --write -c src",
+    "e2e": "bun test e2e/"
   },
   "keywords": [
     "wundergraph",
@@ -67,6 +68,7 @@
     "undici": "^6.19.8"
   },
   "devDependencies": {
+    "@types/bun": "^1.2.3",
     "@types/cli-progress": "^3.11.5",
     "@types/cli-table": "^0.3.1",
     "@types/decompress": "^4.2.7",

cli/package.json

@@ -134,7 +134,8 @@ export default (opts: BaseCommandOptions) => {
         if (resp.response?.details) {
           console.error(pc.red(pc.bold(resp.response?.details)));
         }
-        process.exit(1);
+        process.exitCode = 1;
+        return;
       }
     }
 

cli/src/commands/contract/commands/create.ts

@@ -131,7 +131,8 @@ export default (opts: BaseCommandOptions) => {
         if (resp.response?.details) {
           console.error(pc.red(pc.bold(resp.response?.details)));
         }
-        process.exit(1);
+        process.exitCode = 1;
+        return;
       }
     }
 

cli/src/commands/contract/commands/update.ts

@@ -76,7 +76,9 @@ export default (opts: BaseCommandOptions) => {
         suppressWarnings: options.suppressWarnings,
       });
     } catch {
-      process.exit(1);
+      process.exitCode = 1;
+      // eslint-disable-next-line no-useless-return
+      return;
     }
   });
 

cli/src/commands/feature-flag/commands/create.ts

@@ -23,7 +23,8 @@ export default (opts: BaseCommandOptions) => {
         message: `Are you sure you want to delete the feature flag "${name}"?`,
       });
       if (!deletionConfirmed.confirmDeletion) {
-        process.exit(1);
+        process.exitCode = 1;
+        return;
       }
     }
 
@@ -61,7 +62,9 @@ export default (opts: BaseCommandOptions) => {
         suppressWarnings: options.suppressWarnings,
       });
     } catch {
-      process.exit(1);
+      process.exitCode = 1;
+      // eslint-disable-next-line no-useless-return
+      return;
     }
   });
 

cli/src/commands/feature-flag/commands/delete.ts

@@ -53,7 +53,9 @@ export default (opts: BaseCommandOptions) => {
         suppressWarnings: options.suppressWarnings,
       });
     } catch {
-      process.exit(1);
+      process.exitCode = 1;
+      // eslint-disable-next-line no-useless-return
+      return;
     }
   });
 

cli/src/commands/feature-flag/commands/disable.ts

@@ -53,7 +53,9 @@ export default (opts: BaseCommandOptions) => {
         suppressWarnings: options.suppressWarnings,
       });
     } catch {
-      process.exit(1);
+      process.exitCode = 1;
+      // eslint-disable-next-line no-useless-return
+      return;
     }
   });