diff --git a/.prettierignore b/.prettierignore index ed1de04f6..3b835dee3 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,6 @@ assets **/assets +**/coverage **/dist **/extension/editor **/out diff --git a/package.json b/package.json index e54278d86..3fd0f3b68 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ }, "devDependencies": { "@swc-node/jest": "^1.4.3", + "@ggallon/prettier-plugin-sort-imports": "^3.4.2-canary.0", "@tldraw/lfg": "latest", "@types/jest": "^27.4.0", "@types/node": "^17.0.14", @@ -64,9 +65,6 @@ "typescript": "^4.7.3", "webpack": "^5.68.0" }, - "resolutions": { - "@trivago/prettier-plugin-sort-imports/**/@babel/parser": "^7.17.0" - }, "lint-staged": { "*": "prettier --ignore-unknown --write", "*.{ts,tsx}": "eslint --fix" diff --git a/yarn.lock b/yarn.lock index 609a4cef2..9ffacd34b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1874,6 +1874,14 @@ intl-messageformat "10.0.1" tslib "2.4.0" +"@ggallon/prettier-plugin-sort-imports@^3.4.2-canary.0": + version "3.4.2-canary.0" + resolved "https://registry.yarnpkg.com/@ggallon/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-3.4.2-canary.0.tgz#46fac68966ec27367fca0feb5bb627b19218a022" + integrity sha512-wb0xyAGce5j8FFh9f7c0+Cpog2tzz5zkNQGcuRgheesC/F5HC5Dl0sWw4sETbgBNfDLNPyQfP9YktGQ9TC/CFA== + dependencies: + javascript-natural-sort "^0.7.1" + lodash "^4.17.21" + "@grpc/grpc-js@^1.3.2": version "1.5.5" resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.5.5.tgz#f850a1bb7de8a1d0bb4821aabd3655d1c928d4c6" @@ -7978,6 +7986,11 @@ jake@^10.8.5: filelist "^1.0.1" minimatch "^3.0.4" +javascript-natural-sort@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59" + integrity sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw== + jest-changed-files@^27.5.1: version "27.5.1" resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz#a348aed00ec9bf671cc58a66fcbe7c3dfd6a68f5"