From 9ea0fb8c4dfb5ca34dd98e95b5e50faec3cb27d9 Mon Sep 17 00:00:00 2001 From: jackkav Date: Sat, 12 Aug 2023 01:51:31 +0200 Subject: [PATCH] first pass --- .eslintrc.js | 1 + .prettierrc.json | 6 ++++ .vscode/settings.json | 4 +-- package-lock.json | 45 +++++++++++++++++++++++---- package.json | 2 ++ packages/insomnia/package.json | 2 +- packages/insomnia/tsconfig.build.json | 12 +++---- 7 files changed, 55 insertions(+), 17 deletions(-) create mode 100644 .prettierrc.json diff --git a/.eslintrc.js b/.eslintrc.js index 04f5d0efe5..dc62d5bfa9 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -27,6 +27,7 @@ module.exports = { 'plugin:@typescript-eslint/recommended', 'plugin:react/recommended', 'plugin:react-hooks/recommended', + 'prettier', ], plugins: [ '@typescript-eslint', diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 0000000000..3f29b3ab10 --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,6 @@ +{ + "printWidth": 100, + "semi": true, + "singleQuote": true, + "arrowParens": "avoid" +} diff --git a/.vscode/settings.json b/.vscode/settings.json index 8b990f267a..20317d0ed8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,6 +7,6 @@ }, "files.insertFinalNewline": true, "editor.formatOnSave": true, - "editor.formatOnSaveMode": "modifications", - "editor.defaultFormatter": "vscode.typescript-language-features", + "editor.formatOnSaveMode": "modificationsIfAvailable", + "editor.defaultFormatter": "esbenp.prettier-vscode" } diff --git a/package-lock.json b/package-lock.json index aaaa8d5afe..14cac4baaa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,6 +31,7 @@ "esbuild-runner": "^2.2.2", "eslint": "^8.44.0", "eslint-config-helpers": "^1.2.0", + "eslint-config-prettier": "^9.0.0", "eslint-plugin-filenames": "^1.3.2", "eslint-plugin-html": "^7.1.0", "eslint-plugin-import": "^2.27.5", @@ -40,6 +41,7 @@ "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-simple-import-sort": "^10.0.0", "jest": "^28.1.0", + "prettier": "^3.0.1", "svg-text-to-path": "^1.1.2", "svgo": "^2.8.0", "ts-jest": "^28.0.1", @@ -12047,6 +12049,18 @@ "node": ">=16" } }, + "node_modules/eslint-config-prettier": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz", + "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==", + "dev": true, + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, "node_modules/eslint-import-resolver-node": { "version": "0.3.7", "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz", @@ -17399,6 +17413,21 @@ "node": ">=10.0.0" } }, + "node_modules/json-schema-to-typescript/node_modules/prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -20444,14 +20473,18 @@ } }, "node_modules/prettier": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz", - "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.1.tgz", + "integrity": "sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==", + "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" } }, "node_modules/pretty-format": { @@ -24398,7 +24431,7 @@ "nunjucks": "^3.2.4", "oauth-1.0a": "^2.2.6", "papaparse": "^5.4.1", - "prettier": "2.4.1", + "prettier": "^3.0.1", "shell-quote": "^1.8.1", "swagger-ui-dist": "5.0.0-alpha.6", "tough-cookie": "^4.1.3", diff --git a/package.json b/package.json index 334e746a5d..b081467e4b 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "esbuild-runner": "^2.2.2", "eslint": "^8.44.0", "eslint-config-helpers": "^1.2.0", + "eslint-config-prettier": "^9.0.0", "eslint-plugin-filenames": "^1.3.2", "eslint-plugin-html": "^7.1.0", "eslint-plugin-import": "^2.27.5", @@ -67,6 +68,7 @@ "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-simple-import-sort": "^10.0.0", "jest": "^28.1.0", + "prettier": "^3.0.1", "svg-text-to-path": "^1.1.2", "svgo": "^2.8.0", "ts-jest": "^28.0.1", diff --git a/packages/insomnia/package.json b/packages/insomnia/package.json index aae5e27f6a..d9b1b9b073 100644 --- a/packages/insomnia/package.json +++ b/packages/insomnia/package.json @@ -79,7 +79,7 @@ "nunjucks": "^3.2.4", "oauth-1.0a": "^2.2.6", "papaparse": "^5.4.1", - "prettier": "2.4.1", + "prettier": "^3.0.1", "shell-quote": "^1.8.1", "swagger-ui-dist": "5.0.0-alpha.6", "tough-cookie": "^4.1.3", diff --git a/packages/insomnia/tsconfig.build.json b/packages/insomnia/tsconfig.build.json index c1215ce6d2..4939ccceb2 100644 --- a/packages/insomnia/tsconfig.build.json +++ b/packages/insomnia/tsconfig.build.json @@ -9,13 +9,9 @@ "module": "ESNext", "skipLibCheck": true, "strictNullChecks": true, - "types": ["node", "vite/client"], + "types": ["node", "vite/client"] }, - "include": [ - "**/*.d.ts", - "package.json", - "src", - ], + "include": ["**/*.d.ts", "package.json", "src"], "exclude": [ "**/*.test.ts", "**/*.test.tsx", @@ -32,6 +28,6 @@ "node_modules", "src/coverage", "src/main.min.js", - "src/preload.js", - ], + "src/preload.js" + ] }