Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
5 changes: 0 additions & 5 deletions .changeset/component-auto-import-names.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/marko-ts-server-commands.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/shorthand-class-attribute-merge.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/shorthand-import-tag-completion.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/ts-plugin-scope-to-marko-projects.md

This file was deleted.

16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions packages/language-server/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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 "<foo>"`) 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
Expand Down
4 changes: 2 additions & 2 deletions packages/language-server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@marko/language-server",
"version": "3.2.0",
"version": "3.2.1",
"description": "Marko Language Server",
"keywords": [
"autocomplete",
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 8 additions & 0 deletions packages/language-tools/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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 `<button.btn class="foo"/>`) 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
Expand Down
2 changes: 1 addition & 1 deletion packages/language-tools/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@marko/language-tools",
"version": "2.6.0",
"version": "2.6.1",
"description": "Marko Language Tools",
"keywords": [
"analysis",
Expand Down
6 changes: 6 additions & 0 deletions packages/ts-plugin/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions packages/ts-plugin/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
Expand Down
6 changes: 6 additions & 0 deletions packages/vscode/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/vscode/package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down Expand Up @@ -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",
Expand Down