diff --git a/.gitignore b/.gitignore index 5b48f91c..0a2d50fe 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ yarn-error.log **/.sync.ffs_db .direnv .log +result diff --git a/.prettierignore b/.prettierignore index 8090b3f3..2fbca9b9 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,13 +1,11 @@ .direnv *.bs.js *.gen.tsx -packages/*/dist packages/components/storybook-static node_modules packages/*/node_modules packages/website/.docusaurus packages/squiggle-lang/lib -packages/squiggle-lang/.nyc_output/ packages/squiggle-lang/coverage/ packages/squiggle-lang/.cache/ packages/website/build/ diff --git a/packages/vscode-ext/.prettierignore b/packages/vscode-ext/.prettierignore new file mode 100644 index 00000000..9b148f43 --- /dev/null +++ b/packages/vscode-ext/.prettierignore @@ -0,0 +1,3 @@ +out +dist +media/vendor diff --git a/packages/vscode-ext/package.json b/packages/vscode-ext/package.json index 73ca9dd6..640b371c 100644 --- a/packages/vscode-ext/package.json +++ b/packages/vscode-ext/package.json @@ -121,17 +121,14 @@ "compile": "yarn run compile:vendor && yarn run compile:grammar && yarn run compile:tsc", "watch": "tsc -b -watch", "pretest": "yarn run compile && yarn run lint", - "lint": "eslint client/src server/src --ext ts", - "format": "eslint client/src server/src --ext ts --fix", + "lint": "prettier --check .", + "format": "prettier --write .", "package": "npx vsce package --yarn" }, "devDependencies": { "@types/glob": "^7.2.0", "@types/node": "18.x", "@types/vscode": "^1.70.0", - "@typescript-eslint/eslint-plugin": "^5.33.1", - "@typescript-eslint/parser": "^5.33.1", - "eslint": "^8.22.0", "glob": "^8.0.3", "js-yaml": "^4.1.0", "typescript": "^4.7.4", @@ -143,4 +140,4 @@ "vscode-languageserver-textdocument": "^1.0.5", "@quri/squiggle-lang": "^0.2.11" } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index acdc5bf0..b024c60d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5005,7 +5005,7 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^5.33.1", "@typescript-eslint/eslint-plugin@^5.5.0": +"@typescript-eslint/eslint-plugin@^5.5.0": version "5.33.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz#c0a480d05211660221eda963cc844732fe9b1714" integrity sha512-S1iZIxrTvKkU3+m63YUOxYPKaP+yWDQrdhxTglVDVEVBf+aCSw85+BmJnyUaQQsk5TXFG/LpBu9fa+LrAQ91fQ== @@ -5027,7 +5027,7 @@ dependencies: "@typescript-eslint/utils" "5.29.0" -"@typescript-eslint/parser@^5.33.1", "@typescript-eslint/parser@^5.5.0": +"@typescript-eslint/parser@^5.5.0": version "5.33.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.33.1.tgz#e4b253105b4d2a4362cfaa4e184e2d226c440ff3" integrity sha512-IgLLtW7FOzoDlmaMoXdxG8HOCByTBXrB1V2ZQYSEV1ggMmJfAkMWTwUjjzagS6OkfpySyhKFkBw7A9jYmcHpZA== @@ -8965,7 +8965,7 @@ eslint-webpack-plugin@^3.1.1: normalize-path "^3.0.0" schema-utils "^3.1.1" -eslint@^8.22.0, eslint@^8.3.0: +eslint@^8.3.0: version "8.22.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.22.0.tgz#78fcb044196dfa7eef30a9d65944f6f980402c48" integrity sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==