feat: prettier 3 support

.github/workflows/ci.yml

@@ -12,12 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [16.x, 18.x]
+        node: [18, 20]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Use node@${{ matrix.node }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
           cache: "npm"
@@ -28,4 +28,4 @@ jobs:
       - name: Run tests
         run: npm run ci:test
       - name: Report code coverage
-        run: npm run ci:report
+        uses: codecov/codecov-action@v3

.mocharc.json

@@ -1,4 +1,5 @@
 {
+  "timeout": "5000",
   "extension": ["js", "ts"],
   "enable-source-maps": true,
   "watchFiles": ["src/**/*.ts"],

README.md

@@ -30,6 +30,9 @@
   </a>
 </h1>
 
+> Note:
+> For prettier@2 or below use `prettier-plugin-marko@1`.
+
 A [Prettier](https://prettier.io/) plugin for parsing and printing Marko files.
 
 # Installation

build.ts

@@ -16,7 +16,7 @@ const opts: BuildOptions = {
           ({ path }) => ({
             path,
             external: true,
-          })
+          }),
         );
       },
     },

package.json

@@ -5,32 +5,30 @@
   "author": "Dylan Piercey <[email protected]>",
   "bugs": "https://github.com/marko-js/prettier/issues",
   "devDependencies": {
-    "@babel/generator": "^7.20.14",
-    "@commitlint/cli": "^17.4.4",
-    "@commitlint/config-conventional": "^17.4.4",
+    "@babel/generator": "^7.23.0",
+    "@commitlint/cli": "^17.7.2",
+    "@commitlint/config-conventional": "^17.7.0",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@types/babel__generator": "^7.6.4",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^18.14.0",
-    "@types/prettier": "^2.7.2",
-    "@typescript-eslint/eslint-plugin": "^5.52.0",
-    "@typescript-eslint/parser": "^5.52.0",
-    "codecov": "^3.8.3",
-    "esbuild": "^0.17.8",
-    "esbuild-register": "^3.4.2",
-    "eslint": "^8.34.0",
-    "eslint-config-prettier": "^8.6.0",
-    "fast-glob": "^3.2.12",
+    "@types/babel__generator": "^7.6.5",
+    "@types/mocha": "^10.0.2",
+    "@types/node": "^20.8.4",
+    "@typescript-eslint/eslint-plugin": "^6.7.5",
+    "@typescript-eslint/parser": "^6.7.5",
+    "esbuild": "^0.19.4",
+    "esbuild-register": "^3.5.0",
+    "eslint": "^8.51.0",
+    "eslint-config-prettier": "^9.0.0",
+    "fast-glob": "^3.3.1",
     "fixpack": "^4.0.0",
     "husky": "^8.0.3",
-    "lint-staged": "^13.1.2",
-    "marko": "^5.22.4",
+    "lint-staged": "^14.0.1",
+    "marko": "^5.31.11",
     "mocha": "^10.2.0",
-    "mocha-snap": "^4.3.0",
+    "mocha-snap": "^5.0.0",
     "nyc": "^15.1.0",
-    "prettier": "^2.8.8",
-    "semantic-release": "^20.1.0",
-    "typescript": "^4.9.5"
+    "prettier": "^3.0.3",
+    "semantic-release": "^22.0.5",
+    "typescript": "^5.2.2"
   },
   "exports": {
     ".": {
@@ -66,7 +64,6 @@
   },
   "scripts": {
     "build": "tsc -b && node -r esbuild-register build",
-    "ci:report": "codecov",
     "ci:test": "nyc npm run mocha -- --forbid-pending --forbid-only",
     "format": "npm run lint:eslint -- --fix && npm run lint:prettier -- --write && (fixpack || true)",
     "lint": "tsc -b && npm run lint:eslint && npm run lint:prettier -- -l && fixpack",

src/__tests__/__snapshots__/argument-attr.expected/auto.marko

@@ -3,7 +3,7 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 )/>
 -- ${test}
 

src/__tests__/__snapshots__/argument-attr.expected/concise.marko

@@ -3,7 +3,7 @@ div foo(
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 )
 -- ${test}
 

src/__tests__/__snapshots__/argument-attr.expected/html.marko

@@ -3,7 +3,7 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 )/>
 -- ${test}
 

src/__tests__/__snapshots__/argument-attr.expected/with-parens.marko

@@ -3,7 +3,7 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 )/>
 -- ${test}
 

src/__tests__/__snapshots__/argument-tag.expected/auto.marko

@@ -3,6 +3,6 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 )/>
 <foo(a, b)/>

src/__tests__/__snapshots__/argument-tag.expected/concise.marko

@@ -3,6 +3,6 @@ foo(
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 )
 foo(a, b)

src/__tests__/__snapshots__/argument-tag.expected/html.marko

@@ -3,6 +3,6 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 )/>
 <foo(a, b)/>

src/__tests__/__snapshots__/argument-tag.expected/with-parens.marko

@@ -3,6 +3,6 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 )/>
 <foo(a, b)/>

src/__tests__/__snapshots__/attr-with-argument.expected/auto.marko

@@ -3,5 +3,5 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 )/>

src/__tests__/__snapshots__/attr-with-argument.expected/concise.marko

@@ -3,5 +3,5 @@ div foo(
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 )

src/__tests__/__snapshots__/attr-with-argument.expected/html.marko

@@ -3,5 +3,5 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 )/>

src/__tests__/__snapshots__/attr-with-argument.expected/with-parens.marko

@@ -3,5 +3,5 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 )/>

src/__tests__/__snapshots__/embedded-text-with-placeholders.expected/concise.marko

@@ -1,4 +1,5 @@
-script -- window.bla = ${JSON.stringify(input.bla)};
+script
+  -- window.bla = ${JSON.stringify(input.bla)};
 
 script
   --

src/__tests__/__snapshots__/ignore-embedded-script-errors.expected/auto.marko

@@ -1,7 +1,5 @@
 style {
-
   invalid { color blue; }
-
 }
 
 <style>

src/__tests__/__snapshots__/ignore-embedded-script-errors.expected/concise.marko

@@ -1,7 +1,5 @@
 style {
-
   invalid { color blue; }
-
 }
 
 style

src/__tests__/__snapshots__/ignore-embedded-script-errors.expected/html.marko

@@ -1,7 +1,5 @@
 style {
-
   invalid { color blue; }
-
 }
 
 <style>

src/__tests__/__snapshots__/ignore-embedded-script-errors.expected/with-parens.marko

@@ -1,7 +1,5 @@
 style {
-
   invalid { color blue; }
-
 }
 
 <style>

src/__tests__/__snapshots__/params-tag.expected/auto.marko

@@ -8,5 +8,5 @@
   },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 |/>

src/__tests__/__snapshots__/params-tag.expected/concise.marko

@@ -8,5 +8,5 @@ foo|
   },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 |

src/__tests__/__snapshots__/params-tag.expected/html.marko

@@ -8,5 +8,5 @@
   },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 |/>

src/__tests__/__snapshots__/params-tag.expected/with-parens.marko

@@ -8,5 +8,5 @@
   },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 |/>

src/__tests__/__snapshots__/scriptlets.expected/auto.marko

@@ -19,5 +19,5 @@ $ console.log(
     ["g", 1],
     ["h", 1],
     ["i", 1],
-  ])
+  ]),
 );

src/__tests__/__snapshots__/scriptlets.expected/concise.marko

@@ -19,5 +19,5 @@ $ console.log(
     ["g", 1],
     ["h", 1],
     ["i", 1],
-  ])
+  ]),
 );

src/__tests__/__snapshots__/scriptlets.expected/html.marko

@@ -19,5 +19,5 @@ $ console.log(
     ["g", 1],
     ["h", 1],
     ["i", 1],
-  ])
+  ]),
 );

src/__tests__/__snapshots__/scriptlets.expected/with-parens.marko

@@ -19,5 +19,5 @@ $ console.log(
     ["g", 1],
     ["h", 1],
     ["i", 1],
-  ])
+  ]),
 );

src/__tests__/__snapshots__/static.expected/auto.marko

@@ -19,5 +19,5 @@ static console.log(
     ["g", 1],
     ["h", 1],
     ["i", 1],
-  ])
+  ]),
 );

src/__tests__/__snapshots__/static.expected/concise.marko

@@ -19,5 +19,5 @@ static console.log(
     ["g", 1],
     ["h", 1],
     ["i", 1],
-  ])
+  ]),
 );

src/__tests__/__snapshots__/static.expected/html.marko

@@ -19,5 +19,5 @@ static console.log(
     ["g", 1],
     ["h", 1],
     ["i", 1],
-  ])
+  ]),
 );

src/__tests__/__snapshots__/static.expected/with-parens.marko

@@ -19,5 +19,5 @@ static console.log(
     ["g", 1],
     ["h", 1],
     ["i", 1],
-  ])
+  ]),
 );

src/__tests__/__snapshots__/tag-argument.expected/auto.marko

@@ -3,5 +3,5 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 )/>

src/__tests__/__snapshots__/tag-argument.expected/concise.marko

@@ -3,5 +3,5 @@ foo(
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 )

src/__tests__/__snapshots__/tag-argument.expected/html.marko

@@ -3,5 +3,5 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 )/>

src/__tests__/__snapshots__/tag-argument.expected/with-parens.marko

@@ -3,5 +3,5 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc
+  cccccccccc,
 )/>

src/__tests__/__snapshots__/tag-params-long.expected/auto.marko

@@ -24,7 +24,7 @@
   w,
   x,
   y,
-  z
+  z,
 |>
   ${a}
 </custom-tag>

src/__tests__/__snapshots__/tag-params-long.expected/concise.marko

@@ -24,6 +24,6 @@ custom-tag|
   w,
   x,
   y,
-  z
+  z,
 |
   -- ${a}

src/__tests__/__snapshots__/tag-params-long.expected/html.marko

@@ -24,7 +24,7 @@
   w,
   x,
   y,
-  z
+  z,
 |>
   ${a}
 </custom-tag>

src/__tests__/__snapshots__/tag-params-long.expected/with-parens.marko

@@ -24,7 +24,7 @@
   w,
   x,
   y,
-  z
+  z,
 |>
   ${a}
 </custom-tag>