fix: highlight improvement, avoid invalid diagnostics, deps upgrades.

.changeset/bright-windows-argue.md

@@ -0,0 +1,6 @@
+---
+"marko-vscode": patch
+"@marko/language-server": patch
+---
+
+Upgrade dependencies.

.changeset/metal-toes-peel.md

@@ -0,0 +1,5 @@
+---
+"marko-vscode": patch
+---
+
+Fix syntax highlighting for comma after a tag variable.

.changeset/six-fans-relax.md

@@ -0,0 +1,5 @@
+---
+"@marko/language-server": patch
+---
+
+Fix issue with displaying invalid diagnostics.

.vscode/tasks.json

@@ -4,7 +4,7 @@
 		{
 			"type": "npm",
 			"label": "build",
-			"script": "build",
+			"script": "build:dev",
 			"group": {
 				"kind": "build",
 				"isDefault": true

clients/vscode/build.mts

@@ -1,34 +1,30 @@
 import path from "path";
 import { build } from "esbuild";
 import { createRequire } from "module";
-const require = createRequire(import.meta.url);
+import { fileURLToPath } from "url";
+const thisDir = path.dirname(fileURLToPath(import.meta.url));
+const require = createRequire(thisDir);
 
 await build({
-  bundle: true,
-  minifySyntax: true,
-  minifyWhitespace: true,
-  format: "cjs",
-  outdir: "dist",
-  outbase: "src",
-  platform: "node",
-  target: ["node14"],
-  sourcemap: "linked",
-  entryPoints: ["src/index.ts", "src/server.ts", "src/__tests__/index.ts"],
-  external: [
-    "vscode",
-    "@babel/plugin-transform-modules-commonjs",
-    "mocha",
-    "mocha-snap",
-    "fast-glob",
-    "tsx",
-  ],
-  plugins: [
-    {
-      name: "vscode-css-languageservice-fix",
-      async setup(build) {
-        // alias vscode-css-languageservice to it's esm version
-        // the default is a UMD definition that's incompatible with esbuild.
-        const pkg = "vscode-css-languageservice/package.json";
+    bundle: true,
+    minifySyntax: true,
+    minifyWhitespace: true,
+    absWorkingDir: thisDir,
+    format: "cjs",
+    outdir: "dist",
+    outbase: "src",
+    platform: "node",
+    target: ["node14"],
+    sourcemap: "linked",
+    entryPoints: ["src/index.ts", "src/server.ts", "src/__tests__/index.ts"],
+    external: ["vscode", "mocha", "mocha-snap", "fast-glob", "tsx"],
+    plugins: [
+      {
+        name: "vscode-css-languageservice-fix",
+        async setup(build) {
+          // alias vscode-css-languageservice to it's esm version
+          // the default is a UMD definition that's incompatible with esbuild.
+          const pkg = "vscode-css-languageservice/package.json";
 
         build.onResolve({ filter: /^vscode-css-languageservice$/ }, () => ({
           path: path.join(
@@ -39,5 +35,5 @@ await build({
         }));
       },
     },
-  ],
-});
+  ]
+});

clients/vscode/src/__tests__/diagnostics.test.ts

@@ -5,7 +5,7 @@ import { updateTestDoc } from "./setup.test";
 
 describe("diagnostics", () => {
   // Ensure we wait for any pending diagnostics to be sent.
-  before(() => timers.setTimeout(600));
+  before(() => timers.setTimeout(1800));
   it("missing tag end", async () => {
     await snap.inline(() => diagnostic("<span>"), `Missing ending "span" tag`);
   });

clients/vscode/syntaxes/marko.tmLanguage.json

@@ -716,7 +716,7 @@
           "name": "meta.embedded.ts",
           "contentName": "source.ts",
           "begin": "/(?![/*])",
-          "end": "(?=[;(|/>]|:?=|\\s+[^:]|$)",
+          "end": "(?=[,;(|/>]|:?=|\\s+[^:]|$)",
           "beginCaptures": {
             "0": { "name": "punctuation.separator.tag-variable.marko" }
           },