diff --git a/.changeset/component-auto-import-names.md b/.changeset/component-auto-import-names.md deleted file mode 100644 index 45445e8c..00000000 --- a/.changeset/component-auto-import-names.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@marko/language-tools": patch ---- - -Name the default export of auto-discoverable Marko components (files under a `components`/`tags` directory) after the tag, so auto-imports read `import MyButton from "..."` instead of TypeScript's file-derived `MyButtonMarko` (and `Foo` instead of `index` for `foo/index.marko`). diff --git a/.changeset/marko-ts-server-commands.md b/.changeset/marko-ts-server-commands.md deleted file mode 100644 index 637b445f..00000000 --- a/.changeset/marko-ts-server-commands.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"marko-vscode": patch ---- - -Add a "Marko: Restart Marko and TS Servers" command, and list the built-in "TypeScript: Reload Project" command in the Command Palette for `.marko` files. diff --git a/.changeset/shorthand-class-attribute-merge.md b/.changeset/shorthand-class-attribute-merge.md deleted file mode 100644 index 233dbe5c..00000000 --- a/.changeset/shorthand-class-attribute-merge.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@marko/language-tools": patch ---- - -Merge a tag's shorthand class names (`.foo`) with a literal `class` attribute (eg ``) the same way Marko does at compile time, instead of emitting two `class` keys. This removes the spurious "An object literal cannot have multiple properties with the same name" TypeScript error while still type-checking the `class` attribute value against the tag's `class` type. diff --git a/.changeset/shorthand-import-tag-completion.md b/.changeset/shorthand-import-tag-completion.md deleted file mode 100644 index 4b6da344..00000000 --- a/.changeset/shorthand-import-tag-completion.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@marko/language-server": patch ---- - -Complete the tag name inside a shorthand import string (eg `import Foo from ""`) the same way an open tag name is completed: suggestions filter and sort on the bare tag name, are prioritized above TypeScript's module-specifier completions, and only add the closing `>` when it isn't already present. diff --git a/.changeset/ts-plugin-scope-to-marko-projects.md b/.changeset/ts-plugin-scope-to-marko-projects.md deleted file mode 100644 index d9f20e3c..00000000 --- a/.changeset/ts-plugin-scope-to-marko-projects.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@marko/language-server": patch -"@marko/ts-plugin": patch ---- - -Stop the TypeScript Server plugin from interfering with other plugins (such as Vue's) in projects that don't use Marko. Because the plugin is injected into the editor's shared TypeScript Server for every workspace, it previously patched the shared language service host even where no Marko files exist, which broke diagnostics, go-to-definition, and rename in `.vue` files. It now stays inert unless the project actually uses Marko. diff --git a/package-lock.json b/package-lock.json index 58ffe9b5..ba3fa6c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11124,12 +11124,12 @@ }, "packages/language-server": { "name": "@marko/language-server", - "version": "3.2.0", + "version": "3.2.1", "license": "MIT", "dependencies": { "@luxass/strip-json-comments": "^1.4.0", "@marko/compiler": "^5.39.66", - "@marko/language-tools": "^2.6.0", + "@marko/language-tools": "^2.6.1", "axe-core": "^4.12.1", "htmljs-parser": "^5.11.0", "jsdom": "^29.1.1", @@ -11153,7 +11153,7 @@ }, "packages/language-tools": { "name": "@marko/language-tools", - "version": "2.6.0", + "version": "2.6.1", "license": "MIT", "dependencies": { "@luxass/strip-json-comments": "^1.4.0", @@ -11171,11 +11171,11 @@ }, "packages/ts-plugin": { "name": "@marko/ts-plugin", - "version": "3.1.3", + "version": "3.1.4", "license": "MIT", "devDependencies": { - "@marko/language-server": "^3.0.5", - "@marko/language-tools": "^2.5.64", + "@marko/language-server": "^3.2.1", + "@marko/language-tools": "^2.6.1", "marko": "^5.39.11", "tsx": "^4.22.4", "typescript": "^6.0.3" @@ -11200,10 +11200,10 @@ }, "packages/vscode": { "name": "marko-vscode", - "version": "3.1.0", + "version": "3.1.1", "license": "MIT", "devDependencies": { - "@marko/language-server": "^3.1.0", + "@marko/language-server": "^3.2.1", "@types/vscode": "^1.116.0", "@vscode/test-electron": "^3.0.0", "@vscode/vsce": "^3.9.2", diff --git a/packages/language-server/CHANGELOG.md b/packages/language-server/CHANGELOG.md index 4ce50e1d..e8541526 100644 --- a/packages/language-server/CHANGELOG.md +++ b/packages/language-server/CHANGELOG.md @@ -1,5 +1,16 @@ # Change Log +## 3.2.1 + +### Patch Changes + +- [#531](https://github.com/marko-js/language-server/pull/531) [`914ddda`](https://github.com/marko-js/language-server/commit/914ddda97f209e40ebf3bc566fcd1fb692ea3ab4) Thanks [@DylanPiercey](https://github.com/DylanPiercey)! - Complete the tag name inside a shorthand import string (eg `import Foo from ""`) the same way an open tag name is completed: suggestions filter and sort on the bare tag name, are prioritized above TypeScript's module-specifier completions, and only add the closing `>` when it isn't already present. + +- [#532](https://github.com/marko-js/language-server/pull/532) [`2b7a1ba`](https://github.com/marko-js/language-server/commit/2b7a1badf817175d9873c8eaed0d36e75426ef56) Thanks [@DylanPiercey](https://github.com/DylanPiercey)! - Stop the TypeScript Server plugin from interfering with other plugins (such as Vue's) in projects that don't use Marko. Because the plugin is injected into the editor's shared TypeScript Server for every workspace, it previously patched the shared language service host even where no Marko files exist, which broke diagnostics, go-to-definition, and rename in `.vue` files. It now stays inert unless the project actually uses Marko. + +- Updated dependencies [[`1091b69`](https://github.com/marko-js/language-server/commit/1091b69cd8f95be3aae35560ac0d48ae8c70dc52), [`6450d18`](https://github.com/marko-js/language-server/commit/6450d1855d519922eaf48d91a7cda90afaac4183)]: + - @marko/language-tools@2.6.1 + ## 3.2.0 ### Minor Changes diff --git a/packages/language-server/package.json b/packages/language-server/package.json index 5633d14a..620cedea 100644 --- a/packages/language-server/package.json +++ b/packages/language-server/package.json @@ -1,6 +1,6 @@ { "name": "@marko/language-server", - "version": "3.2.0", + "version": "3.2.1", "description": "Marko Language Server", "keywords": [ "autocomplete", @@ -40,7 +40,7 @@ "dependencies": { "@luxass/strip-json-comments": "^1.4.0", "@marko/compiler": "^5.39.66", - "@marko/language-tools": "^2.6.0", + "@marko/language-tools": "^2.6.1", "axe-core": "^4.12.1", "htmljs-parser": "^5.11.0", "jsdom": "^29.1.1", diff --git a/packages/language-tools/CHANGELOG.md b/packages/language-tools/CHANGELOG.md index dff2ccff..405be331 100644 --- a/packages/language-tools/CHANGELOG.md +++ b/packages/language-tools/CHANGELOG.md @@ -1,5 +1,13 @@ # @marko/language-tools +## 2.6.1 + +### Patch Changes + +- [#530](https://github.com/marko-js/language-server/pull/530) [`1091b69`](https://github.com/marko-js/language-server/commit/1091b69cd8f95be3aae35560ac0d48ae8c70dc52) Thanks [@DylanPiercey](https://github.com/DylanPiercey)! - Name the default export of auto-discoverable Marko components (files under a `components`/`tags` directory) after the tag, so auto-imports read `import MyButton from "..."` instead of TypeScript's file-derived `MyButtonMarko` (and `Foo` instead of `index` for `foo/index.marko`). + +- [#534](https://github.com/marko-js/language-server/pull/534) [`6450d18`](https://github.com/marko-js/language-server/commit/6450d1855d519922eaf48d91a7cda90afaac4183) Thanks [@DylanPiercey](https://github.com/DylanPiercey)! - Merge a tag's shorthand class names (`.foo`) with a literal `class` attribute (eg ``) the same way Marko does at compile time, instead of emitting two `class` keys. This removes the spurious "An object literal cannot have multiple properties with the same name" TypeScript error while still type-checking the `class` attribute value against the tag's `class` type. + ## 2.6.0 ### Minor Changes diff --git a/packages/language-tools/package.json b/packages/language-tools/package.json index cd04f1ff..056390ac 100644 --- a/packages/language-tools/package.json +++ b/packages/language-tools/package.json @@ -1,6 +1,6 @@ { "name": "@marko/language-tools", - "version": "2.6.0", + "version": "2.6.1", "description": "Marko Language Tools", "keywords": [ "analysis", diff --git a/packages/ts-plugin/CHANGELOG.md b/packages/ts-plugin/CHANGELOG.md index 34851175..1f4b4c9d 100644 --- a/packages/ts-plugin/CHANGELOG.md +++ b/packages/ts-plugin/CHANGELOG.md @@ -1,5 +1,11 @@ # @marko/ts-plugin +## 3.1.4 + +### Patch Changes + +- [#532](https://github.com/marko-js/language-server/pull/532) [`2b7a1ba`](https://github.com/marko-js/language-server/commit/2b7a1badf817175d9873c8eaed0d36e75426ef56) Thanks [@DylanPiercey](https://github.com/DylanPiercey)! - Stop the TypeScript Server plugin from interfering with other plugins (such as Vue's) in projects that don't use Marko. Because the plugin is injected into the editor's shared TypeScript Server for every workspace, it previously patched the shared language service host even where no Marko files exist, which broke diagnostics, go-to-definition, and rename in `.vue` files. It now stays inert unless the project actually uses Marko. + ## 3.1.3 ### Patch Changes diff --git a/packages/ts-plugin/package.json b/packages/ts-plugin/package.json index 04685523..4d1bdf5f 100644 --- a/packages/ts-plugin/package.json +++ b/packages/ts-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@marko/ts-plugin", - "version": "3.1.3", + "version": "3.1.4", "description": "TypeScript Server plugin that resolves Marko (.marko) imports with types inside TypeScript files", "keywords": [ "marko", @@ -26,8 +26,8 @@ "build": "tsx build.mts" }, "devDependencies": { - "@marko/language-server": "^3.0.5", - "@marko/language-tools": "^2.5.64", + "@marko/language-server": "^3.2.1", + "@marko/language-tools": "^2.6.1", "marko": "^5.39.11", "tsx": "^4.22.4", "typescript": "^6.0.3" diff --git a/packages/vscode/CHANGELOG.md b/packages/vscode/CHANGELOG.md index a24eeb3c..0155bede 100644 --- a/packages/vscode/CHANGELOG.md +++ b/packages/vscode/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 3.1.1 + +### Patch Changes + +- [#536](https://github.com/marko-js/language-server/pull/536) [`8ee8644`](https://github.com/marko-js/language-server/commit/8ee8644a9f9b397d3daf430bd773eb2f4f65c44a) Thanks [@DylanPiercey](https://github.com/DylanPiercey)! - Add a "Marko: Restart Marko and TS Servers" command, and list the built-in "TypeScript: Reload Project" command in the Command Palette for `.marko` files. + ## 3.1.0 ### Minor Changes diff --git a/packages/vscode/package.json b/packages/vscode/package.json index f596cd93..07db92d8 100644 --- a/packages/vscode/package.json +++ b/packages/vscode/package.json @@ -1,7 +1,7 @@ { "name": "marko-vscode", "displayName": "Marko VSCode", - "version": "3.1.0", + "version": "3.1.1", "private": true, "description": "Marko Syntax Highlighting, Pretty-printing, TypeScript, IntelliSense, and more", "categories": [ @@ -131,7 +131,7 @@ "workspaceContains:**/*.marko" ], "devDependencies": { - "@marko/language-server": "^3.1.0", + "@marko/language-server": "^3.2.1", "@types/vscode": "^1.116.0", "@vscode/test-electron": "^3.0.0", "@vscode/vsce": "^3.9.2",