astro-vscode 2.16.8 → 2.16.9

package/dist/types/env.d.ts

@@ -1,7 +1,7 @@
 /**
  * Astro global available in all contexts in .astro files
  *
- * [Astro documentation](https://docs.astro.build/reference/api-reference/#astro-global)
+ * [Astro documentation](https://docs.astro.build/en/reference/api-reference/)
  */
 declare const Astro: any;
 declare const Fragment: any;

package/package.json

@@ -24,7 +24,7 @@
     "color": "#17191E",
     "theme": "dark"
   },
-  "version": "2.16.8",
+  "version": "2.16.9",
   "author": "withastro",
   "license": "MIT",
   "publisher": "astro-build",
@@ -37,7 +37,7 @@
   "main": "./dist/node/client.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/withastro/astro.git",
+    "url": "git+https://github.com/withastro/astro.git",
     "directory": "packages/language-tools/vscode"
   },
   "contributes": {
@@ -50,6 +50,7 @@
     "typescriptServerPlugins": [
       {
         "name": "astro-ts-plugin-bundle",
+        "path": "./dist/astro-ts-plugin-bundle",
         "enableForWorkspaceTypeScriptVersions": true
       }
     ],
@@ -64,7 +65,7 @@
       },
       {
         "command": "astro.selectTypescriptVersion",
-        "title": "Astro: Select Typescript Version..."
+        "title": "Astro: Select TypeScript Version..."
       },
       {
         "command": "astro.openTsConfig",
@@ -237,12 +238,11 @@
   "devDependencies": {
     "@astrojs/language-server": "^2.16.1",
     "@astrojs/ts-plugin": "^1.10.6",
-    "@types/glob": "^8.1.0",
     "@types/mocha": "^10.0.10",
     "@types/node": "^20.9.0",
     "@types/vscode": "^1.90.0",
-    "@volar/language-server": "~2.4.27",
-    "@volar/vscode": "~2.4.27",
+    "@volar/language-server": "~2.4.28",
+    "@volar/vscode": "~2.4.28",
     "@vscode/test-electron": "^2.5.2",
     "@vscode/test-cli": "^0.0.12",
     "@vscode/vsce": "2.32.0",
@@ -250,14 +250,14 @@
     "esbuild-plugin-copy": "^2.1.1",
     "js-yaml": "^4.1.1",
     "kleur": "^4.1.5",
-    "mocha": "^10.8.2",
-    "ovsx": "^0.10.7",
+    "mocha": "^11.7.5",
+    "ovsx": "^0.10.9",
     "vscode-languageclient": "^9.0.1",
     "vscode-tmgrammar-test": "^0.1.3"
   },
   "dependencies": {
-    "@astrojs/compiler": "^2.13.0",
-    "prettier": "^3.7.4",
+    "@astrojs/compiler": "^2.13.1",
+    "prettier": "^3.8.1",
     "prettier-plugin-astro": "^0.14.1"
   },
   "scripts": {

package/scripts/build.mjs

@@ -18,9 +18,7 @@ export default async function build() {
 		entryPoints: {
 			'dist/node/client': './src/client.ts',
 			'dist/node/server': './node_modules/@astrojs/language-server/bin/nodeServer.js',
-			// We need to generate this inside node_modules so VS Code can resolve it
-			'node_modules/astro-ts-plugin-bundle/index':
-				'./node_modules/@astrojs/ts-plugin/dist/index.js',
+			'dist/astro-ts-plugin-bundle/index': './node_modules/@astrojs/ts-plugin/dist/index.js',
 		},
 		bundle: true,
 		metafile: metaFile,

package/syntaxes/astro.tmLanguage.json

@@ -750,7 +750,7 @@
       ]
     },
     "tags-lang": {
-      "begin": "<(script|style)",
+      "begin": "<(script|style)(?=\\s|/?>)",
       "end": "</\\1\\s*>|/>",
       "beginCaptures": {
         "0": {

package/syntaxes/astro.tmLanguage.src.yaml

@@ -490,7 +490,7 @@ repository:
 
   # Language tags - they are handled differently for the purposes of language injection.
   tags-lang:
-    begin: <(script|style)
+    begin: <(script|style)(?=\s|/?>)
     end: </\1\s*>|/>
     beginCaptures: { 0: { patterns: [include: '#tags-start-node'] } }
     endCaptures: { 0: { patterns: [include: '#tags-end-node'] } }

package/test/grammar/fixtures/components/lowercase-style-prefix.astro

@@ -0,0 +1,6 @@
+---
+const label = "Click Me";
+---
+
+<styled.button>{label}</styled.button>
+<div>After</div>

package/test/grammar/fixtures/components/lowercase-style-prefix.astro.snap

@@ -0,0 +1,30 @@
+>---
+#^^^ source.astro comment
+>const label = "Click Me";
+#^^^^^^^^^^^^^^^^^^^^^^^^^^ source.astro meta.embedded.block.astro source.ts
+>---
+#^^^ source.astro comment
+>
+><styled.button>{label}</styled.button>
+#^ source.astro meta.scope.tag.styled.button.astro meta.tag.start.astro punctuation.definition.tag.begin.astro
+# ^^^^^^ source.astro meta.scope.tag.styled.button.astro meta.tag.start.astro entity.name.tag.astro
+#       ^ source.astro meta.scope.tag.styled.button.astro meta.tag.start.astro
+#        ^^^^^^ source.astro meta.scope.tag.styled.button.astro meta.tag.start.astro entity.name.tag.astro
+#              ^ source.astro meta.scope.tag.styled.button.astro meta.tag.start.astro punctuation.definition.tag.end.astro
+#               ^ source.astro punctuation.section.embedded.begin.astro
+#                ^^^^^ source.astro meta.embedded.expression.astro source.tsx
+#                     ^ source.astro punctuation.section.embedded.end.astro
+#                      ^^ source.astro meta.scope.tag.styled.button.astro meta.tag.end.astro punctuation.definition.tag.begin.astro
+#                        ^^^^^^ source.astro meta.scope.tag.styled.button.astro meta.tag.end.astro entity.name.tag.astro
+#                              ^ source.astro meta.scope.tag.styled.button.astro meta.tag.end.astro
+#                               ^^^^^^ source.astro meta.scope.tag.styled.button.astro meta.tag.end.astro entity.name.tag.astro
+#                                     ^ source.astro meta.scope.tag.styled.button.astro meta.tag.end.astro punctuation.definition.tag.end.astro
+><div>After</div>
+#^ source.astro meta.scope.tag.div.astro meta.tag.start.astro punctuation.definition.tag.begin.astro
+# ^^^ source.astro meta.scope.tag.div.astro meta.tag.start.astro entity.name.tag.astro
+#    ^ source.astro meta.scope.tag.div.astro meta.tag.start.astro punctuation.definition.tag.end.astro
+#     ^^^^^ source.astro text.astro
+#          ^^ source.astro meta.scope.tag.div.astro meta.tag.end.astro punctuation.definition.tag.begin.astro
+#            ^^^ source.astro meta.scope.tag.div.astro meta.tag.end.astro entity.name.tag.astro
+#               ^ source.astro meta.scope.tag.div.astro meta.tag.end.astro punctuation.definition.tag.end.astro
+>

package/test/grammar/test.mjs

@@ -42,7 +42,7 @@ async function snapShotTest() {
 		'-s',
 		'source.astro',
 		'./test/grammar/fixtures/**/*.astro',
-		...allGrammars.reduce((/** @type string[] */ previous, path) => [...previous, '-g', path], []),
+		...allGrammars.flatMap((path) => ['-g', path]),
 		...extraArgs,
 	].map((arg) => (isWindows && arg.includes(' ') ? `"${arg}"` : arg));
 

package/tsconfig.json

@@ -1,9 +1,10 @@
 {
   "extends": "../tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist",
+    "rootDir": "./src",
+    "outDir": "./dist",
     "emitDeclarationOnly": true,
     "checkJs": true
   },
-  "include": ["src", ".vscode-test.js"]
+  "include": ["src"]
 }

package/dist/.vscode-test.d.ts

@@ -1,2 +0,0 @@
-declare const _exports: ((import("@vscode/test-cli").IConfigurationWithGlobalOptions | import("@vscode/test-cli").TestConfiguration | import("@vscode/test-cli").TestConfiguration[]) | Promise<import("@vscode/test-cli").IConfigurationWithGlobalOptions | import("@vscode/test-cli").TestConfiguration | import("@vscode/test-cli").TestConfiguration[]>) | (() => (import("@vscode/test-cli").IConfigurationWithGlobalOptions | import("@vscode/test-cli").TestConfiguration | import("@vscode/test-cli").TestConfiguration[]) | Promise<import("@vscode/test-cli").IConfigurationWithGlobalOptions | import("@vscode/test-cli").TestConfiguration | import("@vscode/test-cli").TestConfiguration[]>);
-export = _exports;