Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-node@v4
with:
node-version: 24
cache: npm

- run: npm clean-install

- run: make vscode-workbench.vsix

- uses: docker/login-action@v3
with:
registry: ghcr.io
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,15 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 22
node-version: 24
cache: npm

- run: npm ci
- run: npm clean-install

- run: npm run tsc

- run: npm run lint

- run: make container

# TODO: tests
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ dev: container-dev
# Ports bound on localhost by the container:
# 3000: Nginx
# 9229: Node.js debugger
npx concurrently --names vscode-workbench,docker \
'npm run watch:vscode-workbench' \
npx concurrently --names host,docker \
'npm run watch' \
'$(DOCKER_RUN) -p 127.0.0.1:3000:3000 \
-p 127.0.0.1:9229:9229 \
-v $(CURDIR):/app/workbench:ro \
Expand Down
4 changes: 4 additions & 0 deletions collab-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
"version": "0.1.0",
"private": true,
"type": "module",
"scripts": {
"watch": "tsc --watch --preserveWatchOutput",
"tsc": "tsc"
},
"dependencies": {
"@hocuspocus/server": "^4.0.0"
}
Expand Down
4 changes: 4 additions & 0 deletions collab-server/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../tsconfig.json",
"include": ["server.ts"]
}
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@
],
"scripts": {
"prepare": "husky && next typegen && prisma generate",
"watch": "concurrently --names vscode-workbench,next 'npm run watch:vscode-workbench' 'npm run dev'",
"watch": "concurrently --names collab-server,vscode-workbench 'npm run watch:collab-server' 'npm run watch:vscode-workbench'",
"watch:collab-server": "npm --workspace collab-server run watch",
"watch:vscode-workbench": "npm --workspace vscode-workbench run watch",
"dev": "next dev",
"build": "npm --workspace vscode-workbench run build && next build",
"start": "next start",
"tsc": "concurrently --names collab-server,vscode-workbench,workbench-app 'npm run tsc:collab-server' 'npm run tsc:vscode-workbench' 'npm run tsc:workbench-app'",
"tsc:collab-server": "npm --workspace collab-server run tsc",
"tsc:vscode-workbench": "npm --workspace vscode-workbench run tsc",
"tsc:workbench-app": "tsc",
"lint": "prettier --check . && eslint"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ else
done

# Rebuild native SQLite bindings before starting in case Docker and host are different platforms
cd "${SCRIPT_DIR}" && npm rebuild better-sqlite3 && npm run dev -- --port 3002 &
cd "${SCRIPT_DIR}" && npm rebuild better-sqlite3 && node_modules/.bin/next dev --port 3002 &
fi
APP_PID=$!
trap 'kill $APP_PID 2>/dev/null' EXIT
Expand Down
12 changes: 11 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@
"@/*": ["./src/*"]
}
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", ".next/dev/types/**/*.ts", "**/*.mts"],
// Subfolders of `.next/` duplicated since without that `next dev` tries to rewrite this config.
"include": [
".next/**/*.ts",
".next/types/**/*.ts",
".next/dev/types/**/*.ts",
"src/**/*.ts",
"src/**/*.tsx",
"next-env.d.ts",
"next.config.ts",
"prisma.config.ts"
],
"exclude": ["node_modules", "branch-*"]
}
5 changes: 3 additions & 2 deletions vscode-workbench/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@
"watch": "concurrently --names esbuild,tsc 'npm run watch:esbuild' 'npm run watch:tsc'",
"watch:esbuild": "node esbuild.mjs --watch",
"watch:tsc": "tsc --noEmit --watch --preserveWatchOutput",
"tsc": "tsc --noEmit",
"build": "tsc --noEmit && node esbuild.mjs --production",
"test": "tsc && vscode-test",
"vscode:prepublish": "npm run build"
"vscode:prepublish": "npm run build",
"test": "tsc && vscode-test"
},
"devDependencies": {
"@types/mocha": "^10.0",
Expand Down
2 changes: 1 addition & 1 deletion vscode-workbench/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"noEmit": false,
"outDir": "out"
},
"include": ["src/**/*", "test/**/*"]
"include": ["src/**/*.ts", "test/**/*.ts"]
}
Loading