diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b4879e3..70d2fdff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -- Nothing yet! +### Added + +- Re-enable support for `prettier-plugin-marko` ([#229](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/pull/229)) + ## [0.5.7] - 2023-11-08 diff --git a/package-lock.json b/package-lock.json index 480a4d4b..80b54b82 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,6 @@ "license": "MIT", "devDependencies": { "@ianvs/prettier-plugin-sort-imports": "^4.1.0", - "@marko/translator-default": "^5.30.1", "@prettier/plugin-pug": "^3.0", "@shopify/prettier-plugin-liquid": "^1.2.2", "@trivago/prettier-plugin-sort-imports": "^4.2.0", @@ -23,12 +22,14 @@ "jsesc": "^2.5.2", "license-checker": "^25.0.1", "line-column": "^1.0.2", + "marko": "^5.31.18", "object-hash": "^2.2.0", "prettier": "3.0", "prettier-plugin-astro": "^0.11.0", "prettier-plugin-css-order": "^2.0.0", "prettier-plugin-import-sort": "^0.0.7", "prettier-plugin-jsdoc": "^1.0.1", + "prettier-plugin-marko": "^3.1.1", "prettier-plugin-organize-attributes": "^1.0.0", "prettier-plugin-organize-imports": "^3.2.3", "prettier-plugin-style-order": "^0.2.2", @@ -53,6 +54,7 @@ "prettier-plugin-css-order": "*", "prettier-plugin-import-sort": "*", "prettier-plugin-jsdoc": "*", + "prettier-plugin-marko": "*", "prettier-plugin-organize-attributes": "*", "prettier-plugin-organize-imports": "*", "prettier-plugin-style-order": "*", @@ -218,7 +220,6 @@ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz", "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==", "dev": true, - "peer": true, "dependencies": { "@babel/types": "^7.22.5" }, @@ -256,7 +257,6 @@ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz", "integrity": "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==", "dev": true, - "peer": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", "@babel/helper-environment-visitor": "^7.22.5", @@ -280,7 +280,6 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, - "peer": true, "bin": { "semver": "bin/semver.js" } @@ -324,7 +323,6 @@ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz", "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==", "dev": true, - "peer": true, "dependencies": { "@babel/types": "^7.23.0" }, @@ -368,7 +366,6 @@ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz", "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==", "dev": true, - "peer": true, "dependencies": { "@babel/types": "^7.22.5" }, @@ -390,7 +387,6 @@ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz", "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==", "dev": true, - "peer": true, "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-member-expression-to-functions": "^7.22.15", @@ -420,7 +416,6 @@ "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz", "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==", "dev": true, - "peer": true, "dependencies": { "@babel/types": "^7.22.5" }, @@ -689,7 +684,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz", "integrity": "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==", "dev": true, - "peer": true, "dependencies": { "@babel/helper-module-transforms": "^7.23.0", "@babel/helper-plugin-utils": "^7.22.5", @@ -707,7 +701,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.15.tgz", "integrity": "sha512-1uirS0TnijxvQLnlv5wQBwOX3E1wCFX7ITv+9pBV2wKEk4K+M5tqDaoNXnTH8tjEIYHLO98MwiTWO04Ggz4XuA==", "dev": true, - "peer": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", "@babel/helper-create-class-features-plugin": "^7.22.15", @@ -2026,9 +2019,9 @@ } }, "node_modules/@marko/babel-utils": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/@marko/babel-utils/-/babel-utils-6.3.1.tgz", - "integrity": "sha512-cxYUqmnS6pG3frmZsyC358qxtzOmalzT6IcF70+OaUeQ5DDq6b4CTi6MvMcCuXFj6ZoLLUkhOCe3HDX78f92Ig==", + "version": "6.3.4", + "resolved": "https://registry.npmjs.org/@marko/babel-utils/-/babel-utils-6.3.4.tgz", + "integrity": "sha512-qS0YEi3K25jUScTTHSkj2IqYTLpUJXT9RAkh8wmw2bxMP7T5wKDJlVpcbGlBt+bZSFTxAkM3eoRo8SMj4rmi3Q==", "dev": true, "dependencies": { "@babel/runtime": "^7.16.0", @@ -2049,11 +2042,10 @@ } }, "node_modules/@marko/compiler": { - "version": "5.33.2", - "resolved": "https://registry.npmjs.org/@marko/compiler/-/compiler-5.33.2.tgz", - "integrity": "sha512-UeAjJXNwPIv1xnj6P6WSJTW/vm15xaFRMzAIUTfozsDdUoxVpp2leWArgEO1srZPD6Xdljr1J3is4QOL5aDCHg==", + "version": "5.34.1", + "resolved": "https://registry.npmjs.org/@marko/compiler/-/compiler-5.34.1.tgz", + "integrity": "sha512-ANpVSaNg/T8Zgz0Cd/XH26JaCIELDHf2lxw99K8MWE7Oud/MIKmwYRM40BUUObcj1N/iPkQ8aUZXOX/zvyfDIg==", "dev": true, - "peer": true, "dependencies": { "@babel/code-frame": "^7.16.0", "@babel/core": "^7.16.0", @@ -2065,7 +2057,7 @@ "@babel/runtime": "^7.16.0", "@babel/traverse": "^7.16.0", "@babel/types": "^7.16.0", - "@marko/babel-utils": "^6.3.0", + "@marko/babel-utils": "^6.3.4", "complain": "^1.6.0", "he": "^1.2.0", "htmljs-parser": "^5.4.3", @@ -2086,7 +2078,6 @@ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", "dev": true, - "peer": true, "bin": { "jsesc": "bin/jsesc" }, @@ -2095,13 +2086,13 @@ } }, "node_modules/@marko/translator-default": { - "version": "5.31.3", - "resolved": "https://registry.npmjs.org/@marko/translator-default/-/translator-default-5.31.3.tgz", - "integrity": "sha512-2N7OQ2AMNFqBqcScg/q3L4Rsh3VToy/SL78yqtbNoom5N5rdoQWyMxOkWR1zFD8/YN9kqbX5AGg2bm5iGLL7Qw==", + "version": "5.31.8", + "resolved": "https://registry.npmjs.org/@marko/translator-default/-/translator-default-5.31.8.tgz", + "integrity": "sha512-TIzmH1EbFA4I0BpaikukwMDMFA2v0GLcWuikQxDlAqEAeITKAZ6W/ygilGkPgcYZlEu7LUtKPKKNnFyXH0w30Q==", "dev": true, "dependencies": { "@babel/runtime": "^7.16.0", - "@marko/babel-utils": "^6.3.1", + "@marko/babel-utils": "^6.3.4", "escape-string-regexp": "^4.0.0", "magic-string": "^0.27.0", "self-closing-tags": "^1.0.1" @@ -2579,8 +2570,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/app-module-path/-/app-module-path-2.2.0.tgz", "integrity": "sha512-gkco+qxENJV+8vFcDiiFhuoSvRXb2a/QPqpSoWhVz829VNJfOTnELbBmPmNKFxf3xdNnw4DWCkzkDaavcX/1YQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/arg": { "version": "5.0.2", @@ -2592,8 +2582,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/argly/-/argly-1.2.0.tgz", "integrity": "sha512-+F3InkcH2XOGK7Jf/ZQis4cwZ4wbfmpBKo5J+SAA9bglT1gVd0e9hroHWarU076pJrAfs8JKuRPwDqwPBOKHnw==", - "dev": true, - "peer": true + "dev": true }, "node_modules/argparse": { "version": "1.0.10", @@ -2699,7 +2688,6 @@ "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", "dev": true, - "peer": true, "engines": { "node": "*" } @@ -3066,8 +3054,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/browser-refresh-client/-/browser-refresh-client-1.1.4.tgz", "integrity": "sha512-FM/UzMFsG7wJ1ocxCSl6U7qGAIWASEk+tlvfJLP2Pd1JfS4kQ1r4d5f+nNmQI8fB8sXSD8+u/mWErEkAMxUu3w==", - "dev": true, - "peer": true + "dev": true }, "node_modules/browserslist": { "version": "4.22.1", @@ -3278,7 +3265,6 @@ "resolved": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz", "integrity": "sha512-eRYY0vPS2a9zt5w5Z0aCeWbrXTEyvk7u/Xf71EzNObrjSCPgMm1Nku/D/u2tiqHBX5j40wWhj54YJLtgn8g55A==", "dev": true, - "peer": true, "dependencies": { "assertion-error": "^1.0.1", "deep-eql": "^0.1.3", @@ -3293,7 +3279,6 @@ "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz", "integrity": "sha512-f9Uv6ezcpvCQjJU0Zqbg+65qdcszv3qUQsZfjdRbWiZ7AMenrX1u0lNk9EoWWX6e1F+NULyg27mtdeZ5WhpljA==", "dev": true, - "peer": true, "engines": { "node": "*" } @@ -3692,7 +3677,6 @@ "resolved": "https://registry.npmjs.org/complain/-/complain-1.6.0.tgz", "integrity": "sha512-9oBfSEfxveaNmo2eSp/vEPkaBVxUhiJTZVgGYayzBchSAXQM6CK1PAQeV5ICShnSgfT+biYzrN7egKwwX+HkCw==", "dev": true, - "peer": true, "dependencies": { "error-stack-parser": "^2.0.1" } @@ -3955,8 +3939,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz", "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/debug": { "version": "4.3.4", @@ -4060,7 +4043,6 @@ "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz", "integrity": "sha512-6sEotTRGBFiNcqVoeHwnfopbSpi5NbH1VWJmYCVkmxMmaVTT0bUTrNaGyBwhgP4MZL012W/mkzIn3Da+iDYweg==", "dev": true, - "peer": true, "dependencies": { "type-detect": "0.1.1" }, @@ -4073,7 +4055,6 @@ "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz", "integrity": "sha512-5rqszGVwYgBoDkIm2oUtvkfZMQ0vk29iDMU0W2qCa3rG0vPDNczCMT4hV/bLBgLg8k8ri6+u3Zbt+S/14eMzlA==", "dev": true, - "peer": true, "engines": { "node": "*" } @@ -4221,7 +4202,6 @@ "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz", "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==", "dev": true, - "peer": true, "dependencies": { "stackframe": "^1.3.4" } @@ -4311,7 +4291,6 @@ "resolved": "https://registry.npmjs.org/events-light/-/events-light-1.0.5.tgz", "integrity": "sha512-jF51LJzg5W+tkJgfZbjlbFCLcyVFEtOjU+xMCBylrXG13X5XHvfp6lNGfyBLF9u1mRTpUsMVYqSDukvpZff1mQ==", "dev": true, - "peer": true, "dependencies": { "chai": "^3.5.0" } @@ -5006,7 +4985,6 @@ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true, - "peer": true, "bin": { "he": "bin/he" } @@ -5033,8 +5011,7 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/htmljs-parser/-/htmljs-parser-5.5.0.tgz", "integrity": "sha512-KcJ84GmLFo+EWQ1hYjgLTSro8kEMFuTTdchOUeco5N95peHMtoY5XsX7YeU4oj+tPrvl9OXHlUkJAnY5zshhaQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/human-signals": { "version": "2.1.0", @@ -7476,7 +7453,6 @@ "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", "dev": true, - "peer": true, "engines": { "node": ">=6" } @@ -7486,7 +7462,6 @@ "resolved": "https://registry.npmjs.org/lasso-caching-fs/-/lasso-caching-fs-1.0.2.tgz", "integrity": "sha512-mudop0s8U3tLm3Fn9lhiZsiELpLeJToEo6RlDLdph7vWRxL9Sz0o+9WUw1IwlpCYXv/P0CLsMYWFgPwIKWEYvg==", "dev": true, - "peer": true, "dependencies": { "raptor-async": "^1.1.2" } @@ -7496,7 +7471,6 @@ "resolved": "https://registry.npmjs.org/lasso-package-root/-/lasso-package-root-1.0.1.tgz", "integrity": "sha512-j6LnauNCldqSDvOxoKpD6sTzudPGMiwcZQbySoF9KvJ0lD9Dp2t6QZF8kC0jbUDHuQPiAo5RuQ/mC3AGXscUYA==", "dev": true, - "peer": true, "dependencies": { "lasso-caching-fs": "^1.0.0" } @@ -7578,8 +7552,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/listener-tracker/-/listener-tracker-2.0.0.tgz", "integrity": "sha512-U6NLzBRyrAsJs9AAjuBYifXtNYnAIDPIp81rNpxNoypXBR7qi/LhsuUWX5399zuTg1sBEQyOnWDYFrBQ28vk/w==", - "dev": true, - "peer": true + "dev": true }, "node_modules/locate-character": { "version": "3.0.0", @@ -7693,14 +7666,13 @@ } }, "node_modules/marko": { - "version": "5.31.11", - "resolved": "https://registry.npmjs.org/marko/-/marko-5.31.11.tgz", - "integrity": "sha512-SaawIgeOxdqW7LLOuBUCokcU1stdddkda6HMtLmZpQB/RJlCqhV63IG77xxLtM79eeV6hpxXo5948I0sMNxXiw==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/marko/-/marko-5.32.0.tgz", + "integrity": "sha512-jsUr2cwpV7DwQ1ctQq4vpOGKunP1RSsRkeV5TsP6JMaQclbnIwy2FtD8CKhYpPc5ROUdZ3EAgnI284tq4evkMA==", "dev": true, - "peer": true, "dependencies": { - "@marko/compiler": "^5.33.2", - "@marko/translator-default": "^5.31.3", + "@marko/compiler": "^5.34.0", + "@marko/translator-default": "^5.31.8", "app-module-path": "^2.2.0", "argly": "^1.2.0", "browser-refresh-client": "1.1.4", @@ -9305,6 +9277,16 @@ "prettier": "^3.0.0" } }, + "node_modules/prettier-plugin-marko": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/prettier-plugin-marko/-/prettier-plugin-marko-3.1.1.tgz", + "integrity": "sha512-O+pGNf4gx0ICXmR5R2+Q9LpsRQzDjC+Q/0L//sViC88QeeEOHYWNbJDNJ8iu/XCnQ95cBzJCjiK+aBqIxEjf/g==", + "dev": true, + "peerDependencies": { + "@marko/compiler": "^5", + "prettier": "^3" + } + }, "node_modules/prettier-plugin-organize-attributes": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/prettier-plugin-organize-attributes/-/prettier-plugin-organize-attributes-1.0.0.tgz", @@ -9474,22 +9456,19 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/raptor-async/-/raptor-async-1.1.3.tgz", "integrity": "sha512-VZCxygWMjW9lKqnApK9D2QbfyzRn7ehiTqnXWwMCLBXANSy+xbnYfbX/5f8YX3bZXu+g+JESmqWPchIQrZj2ig==", - "dev": true, - "peer": true + "dev": true }, "node_modules/raptor-regexp": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/raptor-regexp/-/raptor-regexp-1.0.1.tgz", "integrity": "sha512-DqC7ViHJUs3jLIxJI1/HVvCu3yPJaP8CM7PGsHvjimg7yJ3lLOdCBxlPE0G2Q8OJgUA8Pe7nvhm6lcQ3hZepow==", - "dev": true, - "peer": true + "dev": true }, "node_modules/raptor-util": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/raptor-util/-/raptor-util-3.2.0.tgz", "integrity": "sha512-uEDMMkBCJvjTqYMBnJNxn+neiS6a0rhybQNA9RaexGor1uvKjwyHA5VcbZMZEuqXhKUWbL+WNS7PhuZVZNB7pw==", - "dev": true, - "peer": true + "dev": true }, "node_modules/react-is": { "version": "18.2.0", @@ -10215,7 +10194,6 @@ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "dev": true, - "peer": true, "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -10331,8 +10309,7 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz", "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==", - "dev": true, - "peer": true + "dev": true }, "node_modules/static-extend": { "version": "0.1.2", @@ -11149,8 +11126,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/warp10/-/warp10-2.1.0.tgz", "integrity": "sha512-krhkqzJdUxAZv2Cx0Gz6dN1r7TTrG9RDewkDHBbJQIqbNTCdB5ZUHVh7VkA4DgrKW4ZXPPUQKCwmI/3btDse9A==", - "dev": true, - "peer": true + "dev": true }, "node_modules/which": { "version": "2.0.2", diff --git a/package.json b/package.json index fc4a5672..98a25ebb 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,6 @@ }, "devDependencies": { "@ianvs/prettier-plugin-sort-imports": "^4.1.0", - "@marko/translator-default": "^5.30.1", "@prettier/plugin-pug": "^3.0", "@shopify/prettier-plugin-liquid": "^1.2.2", "@trivago/prettier-plugin-sort-imports": "^4.2.0", @@ -45,12 +44,14 @@ "jsesc": "^2.5.2", "license-checker": "^25.0.1", "line-column": "^1.0.2", + "marko": "^5.31.18", "object-hash": "^2.2.0", "prettier": "3.0", "prettier-plugin-astro": "^0.11.0", "prettier-plugin-css-order": "^2.0.0", "prettier-plugin-import-sort": "^0.0.7", "prettier-plugin-jsdoc": "^1.0.1", + "prettier-plugin-marko": "^3.1.1", "prettier-plugin-organize-attributes": "^1.0.0", "prettier-plugin-organize-imports": "^3.2.3", "prettier-plugin-style-order": "^0.2.2", @@ -72,6 +73,7 @@ "prettier-plugin-css-order": "*", "prettier-plugin-import-sort": "*", "prettier-plugin-jsdoc": "*", + "prettier-plugin-marko": "*", "prettier-plugin-organize-attributes": "*", "prettier-plugin-organize-imports": "*", "prettier-plugin-style-order": "*", diff --git a/src/plugins.js b/src/plugins.js index 0191e7de..6a73199b 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -137,20 +137,19 @@ async function loadBuiltinPlugins() { */ async function loadThirdPartyPlugins() { // Commented out plugins do not currently work with Prettier v3.0 - let [astro, liquid, pug, svelte] = await Promise.all([ + let [astro, liquid, marko, pug, svelte] = await Promise.all([ loadIfExistsESM('prettier-plugin-astro'), loadIfExistsESM('@shopify/prettier-plugin-liquid'), - // loadIfExistsESM('prettier-plugin-marko'), + loadIfExistsESM('prettier-plugin-marko'), // loadIfExistsESM('prettier-plugin-twig-melody'), loadIfExistsESM('@prettier/plugin-pug'), loadIfExistsESM('prettier-plugin-svelte'), ]) - return { parsers: { ...astro.parsers, ...liquid.parsers, - // ...marko.parsers, + ...marko.parsers, // ...melody.parsers, ...pug.parsers, ...svelte.parsers, diff --git a/tests/plugins.test.js b/tests/plugins.test.js index c1479112..94a01657 100644 --- a/tests/plugins.test.js +++ b/tests/plugins.test.js @@ -233,7 +233,7 @@ let tests = [ }, }, { - versions: [2], + versions: [3], plugins: ['prettier-plugin-marko'], tests: { marko: [