Merge pull request #36 from DrSkillIssue/opencode/sunny-wolf

refactor: Prepare the toolchain for TypeScript 6 and TS-next validation

Author: DrSkillIssue

.github/workflows/ci.yml

@@ -33,11 +33,53 @@ concurrency:
 
 jobs:
   check:
+    name: >-
+      CI (${{ matrix.typescript-label }})
     runs-on: ubuntu-latest
     timeout-minutes: 15
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - typescript-label: ts-latest-6
+            typescript-spec: ^6
+            experimental: false
+          - typescript-label: ts-6.0.2
+            typescript-spec: 6.0.2
+            experimental: false
+          - typescript-label: ts-next
+            typescript-spec: next
+            experimental: true
     steps:
       - uses: actions/checkout@v6
 
       - uses: ./.github/actions/setup
 
+      - name: Resolve TypeScript version
+        id: resolve-typescript
+        shell: bash
+        env:
+          TYPESCRIPT_SPEC: ${{ matrix.typescript-spec }}
+        run: |
+          VERSION=$(node <<'NODE'
+          const { execSync } = require('node:child_process');
+
+          const spec = process.env.TYPESCRIPT_SPEC;
+          if (!spec) {
+            throw new Error('TYPESCRIPT_SPEC is required');
+          }
+
+          const version = execSync(`npm view "typescript@${spec}" version`, {
+            encoding: 'utf8',
+          }).trim();
+
+          process.stdout.write(version);
+          NODE
+          )
+          echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
+
+      - name: Set TypeScript version
+        run: bun add --dev --exact typescript@${{ steps.resolve-typescript.outputs.version }}
+
       - run: bun run ci

bun.lock

@@ -1,14 +1,11 @@
 // @ts-check
-import path from "node:path";
 // @ts-ignore
 import js from "@eslint/js";
 import globals from "globals";
 import tseslint from "typescript-eslint";
 import stylistic from "@stylistic/eslint-plugin";
 import solid from "@drskillissue/ganko/eslint-plugin";
 
-const tsconfigPath = path.resolve("tsconfig.json");
-
 export default [
   {
     ignores: [
@@ -38,7 +35,8 @@ export default [
       sourceType: "module",
       parser: tseslint.parser,
       parserOptions: {
-        project: tsconfigPath,
+        projectService: true,
+        tsconfigRootDir: import.meta.dirname,
       },
       globals: globals.node,
     },

eslint.config.mjs

@@ -8,10 +8,11 @@
   ],
   "scripts": {
     "build": "bun run --cwd packages/shared build && bun run --cwd packages/ganko build && bun run --cwd packages/lsp build && bun run --cwd packages/vscode build",
+    "smoke:pack:ganko": "bun run scripts/smoke-test-ganko-package.ts",
     "test": "bun run --cwd packages/ganko test && bun run --cwd packages/lsp test",
     "tsc": "bun run --cwd packages/shared tsc && bun run --cwd packages/ganko tsc && bun run --cwd packages/lsp tsc && bun run --cwd packages/vscode tsc",
     "lint": "eslint --max-warnings=0",
-    "ci": "bun run build && bun run tsc && bun run lint && bun run test && bun run --cwd packages/ganko generate:check",
+    "ci": "bun run build && bun run smoke:pack:ganko && bun run tsc && bun run lint && bun run test && bun run --cwd packages/ganko generate:check",
     "clean": "bun -e \"import { readdir, rm } from 'node:fs/promises'; import { resolve } from 'node:path'; const root = process.cwd(); const entries = await readdir(resolve(root, 'packages'), { withFileTypes: true }); for (const entry of entries) { if (!entry.isDirectory()) continue; await rm(resolve(root, 'packages', entry.name, 'dist'), { recursive: true, force: true }); }\"",
     "rebuild": "bun run clean && bun install && bun run build",
     "package": "bun run build && bun run --cwd packages/vscode package",
@@ -23,13 +24,13 @@
     "@tsconfig/bun": "^1.0.10",
     "@types/bun": "^1.3.10",
     "@types/node": "25.5.0",
-    "@typescript-eslint/utils": "^8.57.1",
+    "@typescript-eslint/utils": "^8.57.2",
     "eslint": "^10.0.3",
     "globals": "^17.4.0",
     "@drskillissue/ganko": "workspace:^",
     "tsup": "^8.5.1",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.57.1",
+    "typescript": "^6.0.0",
+    "typescript-eslint": "^8.57.2",
     "vitest": "^4.1.0",
     "zod": "^4.3.6"
   },