Skip to content

Commit 6650f9d

Browse files
retepsJounQin
andauthored
chore: bump @reteps/dockerfmt, fix related ESM only usage (#433)
Co-authored-by: JounQin <admin@1stg.me>
1 parent c0d68a9 commit 6650f9d

File tree

4 files changed

+25
-7
lines changed

4 files changed

+25
-7
lines changed

.changeset/eighty-snails-rescue.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"prettier-plugin-sh": patch
3+
---
4+
5+
chore: bump `@reteps/dockerfmt`, fix related ESM only usage

packages/sh/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"prettier": "^3.0.3"
5151
},
5252
"dependencies": {
53-
"@reteps/dockerfmt": "^0.2.3",
53+
"@reteps/dockerfmt": "^0.2.5",
5454
"sh-syntax": "^0.5.6"
5555
},
5656
"devDependencies": {

packages/sh/src/index.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { formatDockerfileContents } from '@reteps/dockerfmt'
21
import type { Parser, ParserOptions, Plugin, Printer } from 'prettier'
32
import {
43
type File,
@@ -94,6 +93,18 @@ const dockerfileParser: Parser<string> = {
9493
locEnd: node => node.length,
9594
}
9695

96+
let formatDockerfileContents_:
97+
| typeof import('@reteps/dockerfmt').formatDockerfileContents
98+
| undefined
99+
100+
const getFormatDockerfileContents = async () => {
101+
if (!formatDockerfileContents_) {
102+
const dockerfmt = await import('@reteps/dockerfmt')
103+
formatDockerfileContents_ = dockerfmt.formatDockerfileContents
104+
}
105+
return formatDockerfileContents_
106+
}
107+
97108
const dockerPrinter: Printer<string> = {
98109
// @ts-expect-error -- https://github.com/prettier/prettier/issues/15080#issuecomment-1630987744
99110
async print(
@@ -108,6 +119,7 @@ const dockerPrinter: Printer<string> = {
108119
if (!node) {
109120
return ''
110121
}
122+
const formatDockerfileContents = await getFormatDockerfileContents()
111123
return formatDockerfileContents(node, {
112124
indent,
113125
trailingNewline: true,
@@ -204,6 +216,7 @@ const shPrinter: Printer<Node | string> = {
204216
}
205217

206218
try {
219+
const formatDockerfileContents = await getFormatDockerfileContents()
207220
return await formatDockerfileContents(node, {
208221
indent,
209222
trailingNewline: true,

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4015,12 +4015,12 @@ __metadata:
40154015
languageName: node
40164016
linkType: hard
40174017

4018-
"@reteps/dockerfmt@npm:^0.2.3":
4019-
version: 0.2.3
4020-
resolution: "@reteps/dockerfmt@npm:0.2.3"
4018+
"@reteps/dockerfmt@npm:^0.2.5":
4019+
version: 0.2.5
4020+
resolution: "@reteps/dockerfmt@npm:0.2.5"
40214021
dependencies:
40224022
typescript: "npm:^5.8.3"
4023-
checksum: 10c0/040bfbf13b31b749dae42cb7c8baf41d650cceb6b36ab029d3da291b52558bd2fc1dc39adc2d6b4390364797c00f5dd2875499df3b3ce86f9c858676b15a8ce3
4023+
checksum: 10c0/632545c00b9f4dae9d2ecea82a73356f744f7cb94d4a35f8721b7bd858b996bc88da3e3c7e864287aa909b1b70b45442b1cc94933ee46f8e39127f775f4eba8c
40244024
languageName: node
40254025
linkType: hard
40264026

@@ -14029,7 +14029,7 @@ __metadata:
1402914029
version: 0.0.0-use.local
1403014030
resolution: "prettier-plugin-sh@workspace:packages/sh"
1403114031
dependencies:
14032-
"@reteps/dockerfmt": "npm:^0.2.3"
14032+
"@reteps/dockerfmt": "npm:^0.2.5"
1403314033
"@types/common-tags": "npm:^1.8.4"
1403414034
common-tags: "npm:^1.8.2"
1403514035
sh-syntax: "npm:^0.5.6"

0 commit comments

Comments
 (0)