diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 77fb1ec6..0688d69b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,11 +6,13 @@ on: branches: - main paths: + - 'apps/lsp/**' - 'apps/vscode/**' pull_request: branches: - main paths: + - 'apps/lsp/**' - 'apps/vscode/**' workflow_dispatch: diff --git a/.vscode/launch.json b/.vscode/launch.json index b629cb2f..318b4919 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -22,7 +22,9 @@ "name": "Attach to VS Code LSP Server", "port": 6009, "restart": true, - "outFiles": ["${workspaceRoot}/out/**/*.js"] + "outFiles": [ + "${workspaceFolder}/apps/vscode/out/lsp/**/*.js" + ] } - ] + ] } diff --git a/apps/lsp/build.ts b/apps/lsp/build.ts index 35bbbe52..85594052 100644 --- a/apps/lsp/build.ts +++ b/apps/lsp/build.ts @@ -23,13 +23,13 @@ const nodeSqlLiteWasm = '../../node_modules/node-sqlite3-wasm/dist/*.wasm'; runBuild({ entryPoints: ['./src/index.ts'], - outfile: './dist/lsp.js', + outfile: '../vscode/out/lsp/lsp.js', assets: [ - { from: [nodeSqlLiteWasm], to: './dist/' }, - { from: ['./src/run.js'], to: './dist' }, - { from: ['../../packages/editor-server/src/resources/**'], to: './dist/resources/' }, - { from: ['../../packages/quarto-core/src/resources/**'], to: './dist/resources/' }, - { from: ['./dist/**'], to: ['../vscode/out/lsp/'] }], + { from: [nodeSqlLiteWasm], to: '../vscode/out/lsp/' }, + { from: ['./src/run.js'], to: '../vscode/out/lsp' }, + { from: ['../../packages/editor-server/src/resources/**'], to: '../vscode/out/lsp/resources/' }, + { from: ['../../packages/quarto-core/src/resources/**'], to: '../vscode/out/lsp/resources/' } + ], minify: !dev, dev })