Skip to content

Commit 9726ef5

Browse files
LuLaValvaLuLaValva
committed
fix: update packages
1 parent 409318b commit 9726ef5

8 files changed

Lines changed: 846 additions & 895 deletions

File tree

‎package-lock.json‎

Lines changed: 804 additions & 854 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@
55
"author": "Dylan Piercey <dpiercey@ebay.com>",
66
"bugs": "https://github.com/marko-js/prettier/issues",
77
"devDependencies": {
8-
"@babel/generator": "^7.26.3",
8+
"@babel/generator": "^7.28.3",
99
"@commitlint/cli": "^17.7.2",
1010
"@commitlint/config-conventional": "^17.7.0",
1111
"@istanbuljs/nyc-config-typescript": "^1.0.2",
12-
"@types/babel__generator": "^7.6.8",
12+
"@types/babel__generator": "^7.27.0",
1313
"@types/mocha": "^10.0.10",
1414
"@types/node": "^22.10.2",
1515
"@typescript-eslint/eslint-plugin": "^6.7.5",
1616
"@typescript-eslint/parser": "^6.7.5",
17-
"esbuild": "^0.24.0",
17+
"esbuild": "^0.25.9",
1818
"esbuild-register": "^3.6.0",
1919
"eslint": "^8.51.0",
2020
"eslint-config-prettier": "^9.0.0",
21-
"fast-glob": "^3.3.2",
21+
"fast-glob": "^3.3.3",
2222
"fixpack": "^4.0.0",
2323
"husky": "^8.0.3",
2424
"lint-staged": "^14.0.1",
25-
"marko": "^5.36.3",
25+
"marko": "^5.37.43",
2626
"mocha": "^10.7.3",
2727
"mocha-snap": "^5.0.0",
2828
"nyc": "^15.1.0",
29-
"prettier": "^3.4.2",
29+
"prettier": "^3.6.2",
3030
"semantic-release": "^22.0.5",
31-
"typescript": "^5.7.2"
31+
"typescript": "^5.9.2"
3232
},
3333
"exports": {
3434
".": {

‎src/__tests__/__snapshots__/mixed-shorthand-and-longhand-class.expected/auto.marko‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
<div class="string blue"/>
2-
<div class=["blue", "string_list"]/>
1+
<div class=`${"string"} ${"blue"}`/>
2+
<div class=["string_list", "blue"]/>
33

44
<div class=["templatestring", `${blue}`]/>
5-
<div class=[`${blue}`, "templatestring_list"]/>
5+
<div class=["templatestring_list", `${blue}`]/>
66

77
<div class=["dynamic", blue]/>
8-
<div class=[blue, "dynamic_list"]/>
8+
<div class=["dynamic_list", blue]/>
99

10-
<div class=["red", blue, "green", yellow, "mixed_list"]/>
10+
<div class=["mixed_list", "red", blue, "green", yellow]/>
1111
<div class=[
12+
"long_list",
1213
red,
1314
yellow,
1415
(() => "blue")(),
1516
orange,
1617
...colorList.map((item) => item.color),
1718
green,
18-
"long_list",
1919
]/>
2020
<div class=[
2121
"long_item",
@@ -24,8 +24,8 @@
2424
.map((color) => color.toUpperCase()),
2525
]/>
2626

27-
<div class=["red", "multiple"] class="blue"/>
28-
<div class="multiple red" class=["blue"]/>
27+
<div class=["multiple", "red"] class="blue"/>
28+
<div class=`${"multiple"} ${"red"}` class=["blue"]/>
2929

3030
<div class=[
3131
"multiple",

‎src/__tests__/__snapshots__/mixed-shorthand-and-longhand-class.expected/concise.marko‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
div.string.blue
2-
div class=["blue", "string_list"]
1+
div class=`${"string"} ${"blue"}`
2+
div class=["string_list", "blue"]
33

44
div class=["templatestring", `${blue}`]
5-
div class=[`${blue}`, "templatestring_list"]
5+
div class=["templatestring_list", `${blue}`]
66

77
div class=["dynamic", blue]
8-
div class=[blue, "dynamic_list"]
8+
div class=["dynamic_list", blue]
99

10-
div class=["red", blue, "green", yellow, "mixed_list"]
10+
div class=["mixed_list", "red", blue, "green", yellow]
1111
div class=[
12+
"long_list",
1213
red,
1314
yellow,
1415
(() => "blue")(),
1516
orange,
1617
...colorList.map((item) => item.color),
1718
green,
18-
"long_list",
1919
]
2020
div class=[
2121
"long_item",
@@ -24,8 +24,8 @@ div class=[
2424
.map((color) => color.toUpperCase()),
2525
]
2626

27-
div.blue class=["red", "multiple"]
28-
div.multiple.red class=["blue"]
27+
div.blue class=["multiple", "red"]
28+
div class=`${"multiple"} ${"red"}` class=["blue"]
2929

3030
div class=[
3131
"multiple",

‎src/__tests__/__snapshots__/mixed-shorthand-and-longhand-class.expected/html.marko‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
<div class="string blue"/>
2-
<div class=["blue", "string_list"]/>
1+
<div class=`${"string"} ${"blue"}`/>
2+
<div class=["string_list", "blue"]/>
33

44
<div class=["templatestring", `${blue}`]/>
5-
<div class=[`${blue}`, "templatestring_list"]/>
5+
<div class=["templatestring_list", `${blue}`]/>
66

77
<div class=["dynamic", blue]/>
8-
<div class=[blue, "dynamic_list"]/>
8+
<div class=["dynamic_list", blue]/>
99

10-
<div class=["red", blue, "green", yellow, "mixed_list"]/>
10+
<div class=["mixed_list", "red", blue, "green", yellow]/>
1111
<div class=[
12+
"long_list",
1213
red,
1314
yellow,
1415
(() => "blue")(),
1516
orange,
1617
...colorList.map((item) => item.color),
1718
green,
18-
"long_list",
1919
]/>
2020
<div class=[
2121
"long_item",
@@ -24,8 +24,8 @@
2424
.map((color) => color.toUpperCase()),
2525
]/>
2626

27-
<div class=["red", "multiple"] class="blue"/>
28-
<div class="multiple red" class=["blue"]/>
27+
<div class=["multiple", "red"] class="blue"/>
28+
<div class=`${"multiple"} ${"red"}` class=["blue"]/>
2929

3030
<div class=[
3131
"multiple",

‎src/__tests__/__snapshots__/mixed-shorthand-and-longhand-class.expected/with-parens.marko‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
<div class="string blue"/>
2-
<div class=["blue", "string_list"]/>
1+
<div class=`${"string"} ${"blue"}`/>
2+
<div class=["string_list", "blue"]/>
33

44
<div class=["templatestring", `${blue}`]/>
5-
<div class=[`${blue}`, "templatestring_list"]/>
5+
<div class=["templatestring_list", `${blue}`]/>
66

77
<div class=["dynamic", blue]/>
8-
<div class=[blue, "dynamic_list"]/>
8+
<div class=["dynamic_list", blue]/>
99

10-
<div class=["red", blue, "green", yellow, "mixed_list"]/>
10+
<div class=["mixed_list", "red", blue, "green", yellow]/>
1111
<div class=[
12+
"long_list",
1213
red,
1314
yellow,
1415
(() => "blue")(),
1516
orange,
1617
...colorList.map((item) => item.color),
1718
green,
18-
"long_list",
1919
]/>
2020
<div class=[
2121
"long_item",
@@ -24,8 +24,8 @@
2424
.map((color) => color.toUpperCase()),
2525
]/>
2626

27-
<div class=["red", "multiple"] class="blue"/>
28-
<div class="multiple red" class=["blue"]/>
27+
<div class=["multiple", "red"] class="blue"/>
28+
<div class=`${"multiple"} ${"red"}` class=["blue"]/>
2929

3030
<div class=[
3131
"multiple",

‎src/index.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ export const printers: Record<string, Printer<types.Node>> = {
592592
let bodyDoc: Doc = [];
593593
path.each((childPath) => {
594594
const childNode = childPath.getNode() as types.Statement;
595-
if (childNode && !isEmpty(childNode))
595+
if (childNode && !isEmpty(childNode)) {
596596
bodyDoc = withLineIfNeeded(
597597
childNode,
598598
opts,
@@ -601,6 +601,7 @@ export const printers: Record<string, Printer<types.Node>> = {
601601
withBlockIfNeeded(childNode, childPath.call(print)),
602602
],
603603
);
604+
}
604605
}, "body");
605606
return bodyDoc;
606607
} else {

‎src/utils/with-line-if-needed.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default function withLineIfNeeded(
1111
doc: Doc,
1212
) {
1313
const { originalText } = opts;
14-
let pos = locToPos(node.loc!.start, opts);
14+
let pos = node.loc ? locToPos(node.loc.start, opts) : 0;
1515
let count = 0;
1616

1717
while (--pos >= 0) {

0 commit comments

Comments
 (0)