summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.changeset/sour-steaks-rule.md5
-rw-r--r--packages/astro/package.json3
-rw-r--r--packages/astro/src/cli/check/index.ts9
-rw-r--r--packages/astro/src/cli/check/print.ts3
-rw-r--r--pnpm-lock.yaml24
5 files changed, 27 insertions, 17 deletions
diff --git a/.changeset/sour-steaks-rule.md b/.changeset/sour-steaks-rule.md
new file mode 100644
index 000000000..bd89f451b
--- /dev/null
+++ b/.changeset/sour-steaks-rule.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Update `astro check` to latest version of the language server
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 2c4f0179b..67a62b5ab 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -96,7 +96,7 @@
},
"dependencies": {
"@astrojs/compiler": "^0.24.0",
- "@astrojs/language-server": "^0.23.0",
+ "@astrojs/language-server": "^0.26.2",
"@astrojs/markdown-remark": "^1.1.2",
"@astrojs/telemetry": "^1.0.0",
"@astrojs/webapi": "^1.0.0",
@@ -147,6 +147,7 @@
"strip-ansi": "^7.0.1",
"supports-esm": "^1.0.0",
"tsconfig-resolver": "^3.0.1",
+ "typescript": "*",
"unist-util-visit": "^4.1.0",
"vfile": "^5.3.2",
"vite": "~3.1.3",
diff --git a/packages/astro/src/cli/check/index.ts b/packages/astro/src/cli/check/index.ts
index 60e6b7a97..b5e152abd 100644
--- a/packages/astro/src/cli/check/index.ts
+++ b/packages/astro/src/cli/check/index.ts
@@ -5,6 +5,7 @@ import type { AstroSettings } from '../../@types/astro';
import glob from 'fast-glob';
import * as fs from 'fs';
import { bold, dim, red, yellow } from 'kleur/colors';
+import { createRequire } from 'module';
import ora from 'ora';
import { fileURLToPath, pathToFileURL } from 'url';
import { printDiagnostic } from './print.js';
@@ -23,7 +24,11 @@ export async function check(settings: AstroSettings) {
const spinner = ora(` Getting diagnostics for Astro files in ${fileURLToPath(root)}…`).start();
- let checker = new AstroCheck(root.toString());
+ const require = createRequire(import.meta.url);
+ let checker = new AstroCheck(
+ root.toString(),
+ require.resolve('typescript/lib/tsserverlibrary.js', { paths: [root.toString()] })
+ );
const filesCount = await openAllDocuments(root, [], checker);
let diagnostics = await checker.getDiagnostics();
@@ -38,7 +43,7 @@ export async function check(settings: AstroSettings) {
diagnostics.forEach((diag) => {
diag.diagnostics.forEach((d) => {
- console.log(printDiagnostic(diag.filePath, diag.text, d));
+ console.log(printDiagnostic(diag.fileUri, diag.text, d));
switch (d.severity) {
case DiagnosticSeverity.Error: {
diff --git a/packages/astro/src/cli/check/print.ts b/packages/astro/src/cli/check/print.ts
index aab16e0bd..2093711a9 100644
--- a/packages/astro/src/cli/check/print.ts
+++ b/packages/astro/src/cli/check/print.ts
@@ -20,10 +20,9 @@ export function printDiagnostic(filePath: string, text: string, diag: Diagnostic
// Lines and characters are 0-indexed, so we need to add 1 to the offset to get the actual line and character
const realStartLine = diag.range.start.line + 1;
const realStartCharacter = diag.range.start.character + 1;
- const normalizedFilePath = fileURLToPath(new URL(filePath, 'file://'));
// IDE friendly path that user can CTRL+Click to open the file at a specific line / character
- const IDEFilePath = `${bold(cyan(normalizedFilePath))}:${bold(yellow(realStartLine))}:${bold(
+ const IDEFilePath = `${bold(cyan(fileURLToPath(filePath)))}:${bold(yellow(realStartLine))}:${bold(
yellow(realStartCharacter)
)}`;
result.push(
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 598c812a0..f91e81cb0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -348,7 +348,7 @@ importers:
packages/astro:
specifiers:
'@astrojs/compiler': ^0.24.0
- '@astrojs/language-server': ^0.23.0
+ '@astrojs/language-server': ^0.26.2
'@astrojs/markdown-remark': ^1.1.2
'@astrojs/telemetry': ^1.0.0
'@astrojs/webapi': ^1.0.0
@@ -424,6 +424,7 @@ importers:
strip-ansi: ^7.0.1
supports-esm: ^1.0.0
tsconfig-resolver: ^3.0.1
+ typescript: '*'
unist-util-visit: ^4.1.0
vfile: ^5.3.2
vite: ~3.1.3
@@ -431,7 +432,7 @@ importers:
zod: ^3.17.3
dependencies:
'@astrojs/compiler': 0.24.0
- '@astrojs/language-server': 0.23.3
+ '@astrojs/language-server': 0.26.2
'@astrojs/markdown-remark': link:../markdown/remark
'@astrojs/telemetry': link:../telemetry
'@astrojs/webapi': link:../webapi
@@ -482,6 +483,7 @@ importers:
strip-ansi: 7.0.1
supports-esm: 1.0.0
tsconfig-resolver: 3.0.1
+ typescript: 4.8.3
unist-util-visit: 4.1.1
vfile: 5.3.5
vite: 3.1.3_sass@1.54.9
@@ -3292,15 +3294,15 @@ packages:
resolution: {integrity: sha512-xZ81C/oMfExdF18I1Tyd2BKKzBqO+qYYctSy4iCwH4UWSo/4Y8A8MAzV1hG67uuE7hFRourSl6H5KUbhyChv/A==}
dev: false
- /@astrojs/language-server/0.23.3:
- resolution: {integrity: sha512-ROoMKo37NZ76pE/A2xHfjDlgfsNnFmkhL4+Wifs0L855n73SUCbnXz7ZaQktIGAq2Te2TpSjAawiOx0q9L5qeg==}
+ /@astrojs/language-server/0.26.2:
+ resolution: {integrity: sha512-9nkfdd6CMXLDIJojnwbYu5XrYfOI+g63JlktOlpFCwFjFNpm1u0e/+pXXmj6Zs+PkSTo0kV1UM77dRKRS5OC1Q==}
hasBin: true
dependencies:
'@vscode/emmet-helper': 2.8.4
+ events: 3.3.0
prettier: 2.7.1
prettier-plugin-astro: 0.5.4
source-map: 0.7.4
- typescript: 4.6.4
vscode-css-languageservice: 6.1.1
vscode-html-languageservice: 5.0.2
vscode-languageserver: 8.0.2
@@ -11873,6 +11875,11 @@ packages:
engines: {node: '>=10.13.0'}
dev: true
+ /events/3.3.0:
+ resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
+ engines: {node: '>=0.8.x'}
+ dev: false
+
/execa/5.1.1:
resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
engines: {node: '>=10'}
@@ -17054,12 +17061,6 @@ packages:
mime-types: 2.1.35
dev: true
- /typescript/4.6.4:
- resolution: {integrity: sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==}
- engines: {node: '>=4.2.0'}
- hasBin: true
- dev: false
-
/typescript/4.7.4:
resolution: {integrity: sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==}
engines: {node: '>=4.2.0'}
@@ -17070,7 +17071,6 @@ packages:
resolution: {integrity: sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==}
engines: {node: '>=4.2.0'}
hasBin: true
- dev: true
/uhyphen/0.1.0:
resolution: {integrity: sha512-o0QVGuFg24FK765Qdd5kk0zU/U4dEsCtN/GSiwNI9i8xsSVtjIAOdTaVhLwZ1nrbWxFVMxNDDl+9fednsOMsBw==}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-11 14:06:22 +0000