Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix VS Code extension #467

Merged
merged 9 commits into from
Jun 16, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
fix: vscode extension
  • Loading branch information
Nate Moore committed Jun 16, 2021
commit 16d94a30a01b79909211cab2a3369d4ea96c0bbd
2 changes: 1 addition & 1 deletion scripts/cmd/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default async function build(...args) {

const { type = 'module', dependencies = {} } = await fs.readFile('./package.json').then((res) => JSON.parse(res.toString()));
const format = type === 'module' ? 'esm' : 'cjs';
const external = [...Object.keys(dependencies), 'source-map-support', 'source-map-support/register.js', 'vscode'];
const external = [...Object.keys(dependencies), '@astrojs/language-server/bin/server.js', 'source-map-support', 'source-map-support/register.js', 'vscode'];
const outdir = 'dist';
await clean(outdir);

Expand Down
4 changes: 4 additions & 0 deletions tools/language-server/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# @astrojs/language-server

## 0.5.0

- Fix `bin` file

## 0.5.0-next.1

- Expose `bin/server.js` as `astro-ls`
Expand Down
3 changes: 2 additions & 1 deletion tools/language-server/bin/server.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#! /usr/bin/env node

// @ts-ignore
// eslint-disable-next-line @typescript-eslint/no-var-requires
const { startServer } = require('../dist/index');
const { startServer } = require('@astrojs/language-server/dist/index.js');

startServer();
2 changes: 1 addition & 1 deletion tools/language-server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@astrojs/language-server",
"version": "0.5.0-next.1",
"version": "0.5.0",
"author": "Skypack",
"license": "MIT",
"type": "commonjs",
Expand Down
5 changes: 3 additions & 2 deletions tools/vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@
"color": "#FFBE2D",
"theme": "dark"
},
"version": "0.4.3",
"version": "0.5.0",
"author": "Astro",
"license": "MIT",
"publisher": "astro-build",
"scripts": {
"vscode:prepublish": "yarn build",
"vscode:publish": "node ./scripts/publish.mjs",
"build": "astro-scripts build 'src/index.ts'",
"dev": "astro-scripts dev 'src/index.ts'"
Expand All @@ -24,7 +25,7 @@
"onLanguage:astro"
],
"dependencies": {
"@astrojs/language-server": "^0.4.0",
"@astrojs/language-server": "0.5.0",
"vscode-emmet-helper": "2.1.2",
"vscode-html-languageservice": "^3.0.3",
"vscode-languageclient": "~7.0.0"
Expand Down
4 changes: 2 additions & 2 deletions tools/vscode/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ export async function activate(context: vscode.ExtensionContext) {
/** */
function createLanguageService(context: vscode.ExtensionContext, mode: 'doc', id: string, name: string, port: number) {
const { workspace } = vscode;
const serverModule = require.resolve('astro-languageserver/bin/server.js');
const serverModule = require.resolve('@astrojs/language-server/bin/server.js');
const debugOptions = { execArgv: ['--nolazy', '--inspect=' + port] };
const serverOptions: lsp.ServerOptions = {
run: { module: 'astro-languageserver', transport: lsp.TransportKind.ipc },
run: { module: serverModule, transport: lsp.TransportKind.ipc },
debug: {
module: serverModule,
transport: lsp.TransportKind.ipc,
Expand Down