Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
AngusMorton committed Feb 1, 2025
2 parents 6bd0576 + b2b476a commit 159b10e
Show file tree
Hide file tree
Showing 277 changed files with 12,537 additions and 431 deletions.
1,683 changes: 1,305 additions & 378 deletions package-lock.json

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
"name": "marko-language-server-repo",
"devDependencies": {
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.11",
"@eslint/js": "^9.17.0",
"@changesets/cli": "^2.27.12",
"@eslint/js": "^9.19.0",
"@types/mocha": "^10.0.10",
"@types/node": "^22.10.2",
"esbuild": "^0.24.0",
"eslint": "^9.17.0",
"@types/node": "^22.12.0",
"esbuild": "^0.24.2",
"eslint": "^9.19.0",
"eslint-formatter-unix": "^8.40.0",
"eslint-plugin-simple-import-sort": "^12.1.1",
"fast-glob": "^3.3.2",
"fast-glob": "^3.3.3",
"husky": "^9.1.7",
"lint-staged": "^15.2.11",
"mocha": "^11.0.1",
"lint-staged": "^15.4.3",
"mocha": "^11.1.0",
"mocha-snap": "^5.0.0",
"prettier": "^3.4.2",
"tsx": "^4.19.2",
"typescript": "^5.7.2",
"typescript-eslint": "^8.18.1"
"typescript": "^5.7.3",
"typescript-eslint": "^8.22.0"
},
"private": true,
"scripts": {
Expand Down
9 changes: 9 additions & 0 deletions packages/language-server/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Change Log

## 1.4.15

### Patch Changes

- [#340](https://github.com/marko-js/language-server/pull/340) [`4607c2d`](https://github.com/marko-js/language-server/commit/4607c2d476bf756a8b7d6f128d9ffffb1673e5d8) Thanks [@DylanPiercey](https://github.com/DylanPiercey)! - Fix issue where tag var mutations at multiple levels were causing higher levels to be non writable.

- Updated dependencies [[`4607c2d`](https://github.com/marko-js/language-server/commit/4607c2d476bf756a8b7d6f128d9ffffb1673e5d8)]:
- @marko/language-tools@2.5.14

## 1.4.14

### Patch Changes
Expand Down
15 changes: 8 additions & 7 deletions packages/language-server/package.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
{
"name": "@marko/language-server",
"description": "Marko Language Server",
"version": "1.4.14",
"version": "1.4.15",
"bin": {
"marko-language-server": "./bin.js"
},
"bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
"dependencies": {
"@luxass/strip-json-comments": "^1.3.2",
"@marko/language-tools": "^2.5.13",
"@luxass/strip-json-comments": "^1.4.0",
"@marko/language-tools": "^2.5.14",
"@marko/babel-utils": "^6.6.3",
"@marko/compiler": "^5.39.6",
"@marko/compiler": "^5.39.11",
"htmljs-parser": "^5.5.3",
"marko": "^5.37.7",
"marko": "^5.37.12",
"prettier": "^3.4.2",
"prettier-plugin-marko": "^3.1.12",
"relative-import-path": "^1.0.0",
"typescript": "^5.7.2",
"typescript": "^5.7.3",
"@volar/kit": "^2.4.5",
"@volar/language-core": "^2.4.5",
"@volar/language-server": "^2.4.5",
"@volar/language-service": "^2.4.5",
"@volar/typescript": "^2.4.5",
"@volar/test-utils": "^2.4.5",
"volar-service-css": "^0.0.62",
"volar-service-emmet": "^0.0.62",
"volar-service-html": "^0.0.62",
Expand All @@ -33,7 +34,7 @@
"vscode-languageserver-textdocument": "^1.0.12",
"vscode-uri": "^3.0.8",
"axe-core": "^4.10.2",
"jsdom": "^25.0.1"
"jsdom": "^26.0.0"
},
"devDependencies": {
"@types/jsdom": "21.1.7",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<a data-marko-node-id="0" href="google.com" accesskey="g">Link to Google</a><a data-marko-node-id="1" href="github.com" accesskey="g">Link to GitHub</a>
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
export interface Input {}
abstract class Component extends Marko.Component<Input> {}
export { type Component };
(function (this: void) {
const input = Marko._.any as Input;
const component = Marko._.any as Component;
const state = Marko._.state(component);
const out = Marko._.out;
const $signal = Marko._.any as AbortSignal;
const $global = Marko._.getGlobal(
// @ts-expect-error We expect the compiler to error because we are checking if the MarkoRun.Context is defined.
(Marko._.error, Marko._.any as MarkoRun.Context),
);
Marko._.noop({ component, state, out, input, $global, $signal });
Marko._.renderNativeTag("a")()()({
href: "google.com",
accesskey: "g",
["renderBody" /*a*/]: (() => {
return () => {
return Marko._.voidReturn;
};
})(),
});
Marko._.renderNativeTag("a")()()({
href: "github.com",
accesskey: "g",
["renderBody" /*a*/]: (() => {
return () => {
return Marko._.voidReturn;
};
})(),
});
return;
})();
export default new (class Template extends Marko._.Template<{
render(
input: Marko.TemplateInput<Input>,
stream?: {
write: (chunk: string) => void;
end: (chunk?: string) => void;
},
): Marko.Out<Component>;

render(
input: Marko.TemplateInput<Input>,
cb?: (err: Error | null, result: Marko.RenderResult<Component>) => void,
): Marko.Out<Component>;

renderSync(input: Marko.TemplateInput<Input>): Marko.RenderResult<Component>;

renderToString(input: Marko.TemplateInput<Input>): string;

stream(
input: Marko.TemplateInput<Input>,
): ReadableStream<string> & NodeJS.ReadableStream;

api: "class";
_(): () => <__marko_internal_input extends unknown>(
input: Marko.Directives &
Input &
Marko._.Relate<__marko_internal_input, Marko.Directives & Input>,
) => Marko._.ReturnWithScope<__marko_internal_input, void>;
}> {})();
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<map data-marko-node-id="0" name="Map">
<area data-marko-node-id="1" shape="rect" href="image-map">
</map><img data-marko-node-id="2" src="source"><a data-marko-node-id="3" href="ebay.com">
<img data-marko-node-id="4" src="ebay-logo.png" alt="eBay">
eBay
</a><input data-marko-node-id="5" type="image"><object data-marko-node-id="6" id="object"></object><div data-marko-node-id="7" role="img"></div><svg data-marko-node-id="8" role="img"></svg><img data-marko-node-id="9" alt="test">
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
export interface Input {}
abstract class Component extends Marko.Component<Input> {}
export { type Component };
(function (this: void) {
const input = Marko._.any as Input;
const component = Marko._.any as Component;
const state = Marko._.state(component);
const out = Marko._.out;
const $signal = Marko._.any as AbortSignal;
const $global = Marko._.getGlobal(
// @ts-expect-error We expect the compiler to error because we are checking if the MarkoRun.Context is defined.
(Marko._.error, Marko._.any as MarkoRun.Context),
);
Marko._.noop({ component, state, out, input, $global, $signal });
Marko._.renderNativeTag("map")()()({
name: "Map",
["renderBody" /*map*/]: (() => {
Marko._.renderNativeTag("area")()()({
shape: "rect",
href: "image-map",
});
return () => {
return Marko._.voidReturn;
};
})(),
});
Marko._.renderNativeTag("img")()()({
src: "source",
});
Marko._.renderNativeTag("a")()()({
href: "ebay.com",
["renderBody" /*a*/]: (() => {
Marko._.renderNativeTag("img")()()({
src: "ebay-logo.png",
alt: "eBay",
});
return () => {
return Marko._.voidReturn;
};
})(),
});
Marko._.renderNativeTag("input")()()({
type: "image",
});
Marko._.renderNativeTag("object")()()({
id: "object",
["renderBody" /*object*/]: (() => {
return () => {
return Marko._.voidReturn;
};
})(),
});
Marko._.renderNativeTag("div")()()({
role: "img",
["renderBody" /*div*/]: (() => {
return () => {
return Marko._.voidReturn;
};
})(),
});
Marko._.renderNativeTag("svg")()()({
role: "img",
["renderBody" /*svg*/]: (() => {
return () => {
return Marko._.voidReturn;
};
})(),
});
Marko._.renderNativeTag("img")()()({
alt: "test",
});
return;
})();
export default new (class Template extends Marko._.Template<{
render(
input: Marko.TemplateInput<Input>,
stream?: {
write: (chunk: string) => void;
end: (chunk?: string) => void;
},
): Marko.Out<Component>;

render(
input: Marko.TemplateInput<Input>,
cb?: (err: Error | null, result: Marko.RenderResult<Component>) => void,
): Marko.Out<Component>;

renderSync(input: Marko.TemplateInput<Input>): Marko.RenderResult<Component>;

renderToString(input: Marko.TemplateInput<Input>): string;

stream(
input: Marko.TemplateInput<Input>,
): ReadableStream<string> & NodeJS.ReadableStream;

api: "class";
_(): () => <__marko_internal_input extends unknown>(
input: Marko.Directives &
Input &
Marko._.Relate<__marko_internal_input, Marko.Directives & Input>,
) => Marko._.ReturnWithScope<__marko_internal_input, void>;
}> {})();
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div data-marko-node-id="0" aria-pressed="true">Click me</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
export interface Input {}
abstract class Component extends Marko.Component<Input> {}
export { type Component };
(function (this: void) {
const input = Marko._.any as Input;
const component = Marko._.any as Component;
const state = Marko._.state(component);
const out = Marko._.out;
const $signal = Marko._.any as AbortSignal;
const $global = Marko._.getGlobal(
// @ts-expect-error We expect the compiler to error because we are checking if the MarkoRun.Context is defined.
(Marko._.error, Marko._.any as MarkoRun.Context),
);
Marko._.noop({ component, state, out, input, $global, $signal });
Marko._.renderNativeTag("div")()()({
"aria-pressed": "true",
["renderBody" /*div*/]: (() => {
return () => {
return Marko._.voidReturn;
};
})(),
});
return;
})();
export default new (class Template extends Marko._.Template<{
render(
input: Marko.TemplateInput<Input>,
stream?: {
write: (chunk: string) => void;
end: (chunk?: string) => void;
},
): Marko.Out<Component>;

render(
input: Marko.TemplateInput<Input>,
cb?: (err: Error | null, result: Marko.RenderResult<Component>) => void,
): Marko.Out<Component>;

renderSync(input: Marko.TemplateInput<Input>): Marko.RenderResult<Component>;

renderToString(input: Marko.TemplateInput<Input>): string;

stream(
input: Marko.TemplateInput<Input>,
): ReadableStream<string> & NodeJS.ReadableStream;

api: "class";
_(): () => <__marko_internal_input extends unknown>(
input: Marko.Directives &
Input &
Marko._.Relate<__marko_internal_input, Marko.Directives & Input>,
) => Marko._.ReturnWithScope<__marko_internal_input, void>;
}> {})();
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<button data-marko-node-id="0" role="heading" aria-level="3">
header button
</button>
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
export interface Input {}
abstract class Component extends Marko.Component<Input> {}
export { type Component };
(function (this: void) {
const input = Marko._.any as Input;
const component = Marko._.any as Component;
const state = Marko._.state(component);
const out = Marko._.out;
const $signal = Marko._.any as AbortSignal;
const $global = Marko._.getGlobal(
// @ts-expect-error We expect the compiler to error because we are checking if the MarkoRun.Context is defined.
(Marko._.error, Marko._.any as MarkoRun.Context),
);
Marko._.noop({ component, state, out, input, $global, $signal });
Marko._.renderNativeTag("button")()()({
role: "heading",
"aria-level": "3",
["renderBody" /*button*/]: (() => {
return () => {
return Marko._.voidReturn;
};
})(),
});
return;
})();
export default new (class Template extends Marko._.Template<{
render(
input: Marko.TemplateInput<Input>,
stream?: {
write: (chunk: string) => void;
end: (chunk?: string) => void;
},
): Marko.Out<Component>;

render(
input: Marko.TemplateInput<Input>,
cb?: (err: Error | null, result: Marko.RenderResult<Component>) => void,
): Marko.Out<Component>;

renderSync(input: Marko.TemplateInput<Input>): Marko.RenderResult<Component>;

renderToString(input: Marko.TemplateInput<Input>): string;

stream(
input: Marko.TemplateInput<Input>,
): ReadableStream<string> & NodeJS.ReadableStream;

api: "class";
_(): () => <__marko_internal_input extends unknown>(
input: Marko.Directives &
Input &
Marko._.Relate<__marko_internal_input, Marko.Directives & Input>,
) => Marko._.ReturnWithScope<__marko_internal_input, void>;
}> {})();
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<body data-marko-node-id="0" aria-hidden="true"></body>
Loading

0 comments on commit 159b10e

Please sign in to comment.