diff --git a/.eslintrc.js b/.eslintrc.js index 36c5262375..54e14c2ac5 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -8,7 +8,6 @@ module.exports = { "eslint:recommended", "plugin:react/recommended", "plugin:@typescript-eslint/recommended", - "prettier", ], overrides: [], parser: "@typescript-eslint/parser", diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index ce519cc13f..0000000000 --- a/.prettierignore +++ /dev/null @@ -1,24 +0,0 @@ -tools/ -electron/env.json -src/json/schema -licenses.json -**/*.min.js - -**/*.css -**/*.scss - -# generated by update.sh -*-arm64/ -windows/ - -# ignore everything in dist -/dist/* -# except... -!/dist/css -!/dist/js/export.js -!/dist/index.html -!/dist/index.web.html -!/dist/polyfill.js -!/dist/run.js -!/dist/workers/graph.js -!/dist/workers/lib/util.js diff --git a/.prettierrc.json b/.prettierrc.json deleted file mode 100644 index 00664339ca..0000000000 --- a/.prettierrc.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "parser": "typescript", - "trailingComma": "es5", - "tabWidth": 4, - "useTabs": true, - "arrowParens": "avoid", - "semi": true, - "singleQuote": true, - - "plugins": ["@trivago/prettier-plugin-sort-imports"], - "importOrderSeparation": true, - "importOrderSortSpecifiers": true, - - "overrides": [ - { - "files": "*.{yml,yaml}", - "options": { - "semi": false, - "tabWidth": 2, - "parser": "yaml" - } - }, - { - "files": "*.md", - "options": { - "tabWidth": 2, - "parser": "markdown" - } - }, - { - "files": "*.json", - "options": { "parser": "json" } - }, - { - "files": "*.{ts,tsx}", - "options": { - "parser": "typescript" - } - }, - { - "files": "*.{svg,html}", - "options": { "parser": "html" } - }, - { - "files": ["*.code-workspace"], - "options": { "parser": "json" } - } - ] -} diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 7355b16d63..0000000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"] -} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 1295ee63d0..0000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "editor.formatOnSave": true -} diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 87c733d551..dbf2167097 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -113,14 +113,13 @@ All pull requests will be reviewed by the team. #### Setting up IDE - vscode - 1. Open cloned repository. + 1. Open cloned repository as vscode workspace using [js-anytype.code-workspace](../js-anytype.code-workspace). 2. Install recommended extensions. - IntelliJ (Ultimate) / WebStorm - 1. Install the [Prettier](https://plugins.jetbrains.com/plugin/10456-prettier) plugin - 2. Enable `Settings > Language & Frameworks > Javascript > Code Quality Tools > ESLint > Automatic ESLint configuration`. - 3. Enable `Settings > Language & Frameworks > Javascript > Prettier > On save`. + 1. Enable `Settings > Language & Frameworks > Javascript > Code Quality Tools > ESLint > Automatic ESLint configuration`. + 2. Install the [EditorConfig](https://plugins.jetbrains.com/plugin/7294-editorconfig) plugin ## Contributors Recognition diff --git a/js-anytype.code-workspace b/js-anytype.code-workspace index 6dde4b266a..af8d5b469b 100644 --- a/js-anytype.code-workspace +++ b/js-anytype.code-workspace @@ -6,7 +6,6 @@ ], "extensions": { "recommendations": [ - "esbenp.prettier-vscode", "aaron-bond.better-comments", "github.copilot", "eamodio.gitlens", @@ -15,7 +14,7 @@ ] }, "settings": { - "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnSave": false, "debug.inlineValues": "on" } } diff --git a/package-lock.json b/package-lock.json index f6aba05b44..80bff7a4d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,7 +61,6 @@ "sha1": "^1.1.1" }, "devDependencies": { - "@trivago/prettier-plugin-sort-imports": "^4.2.0", "@types/history": "^4.7.8", "@types/jquery": "^3.5.14", "@types/katex": "^0.14.0", @@ -80,7 +79,6 @@ "electron-builder": "^24.6.3", "electron-notarize": "^0.2.1", "eslint": "^8.29.0", - "eslint-config-prettier": "^8.5.0", "eslint-plugin-react": "^7.31.11", "husky": "^8.0.3", "license-checker": "^25.0.1", @@ -89,7 +87,6 @@ "npm": "^9.8.1", "npm-run-all": "^4.1.5", "patch-package": "^6.4.7", - "prettier": "^2.7.1", "sass": "^1.62.0", "sass-loader": "^8.0.2", "source-map-loader": "^0.2.4", @@ -126,126 +123,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/generator": { - "version": "7.17.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz", - "integrity": "sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==", - "dev": true, - "dependencies": { - "@babel/types": "^7.17.0", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/generator/node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz", - "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-function-name": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz", - "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==", - "dev": true, - "dependencies": { - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-function-name/node_modules/@babel/types": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", - "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", - "dev": true, - "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", - "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", - "dev": true, - "dependencies": { - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables/node_modules/@babel/types": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", - "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", - "dev": true, - "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", - "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", - "dev": true, - "dependencies": { - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-split-export-declaration/node_modules/@babel/types": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", - "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", - "dev": true, - "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-validator-identifier": { "version": "7.22.5", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", @@ -269,18 +146,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/parser": { - "version": "7.22.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz", - "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@babel/runtime": { "version": "7.18.6", "license": "MIT", @@ -295,68 +160,6 @@ "version": "0.13.9", "license": "MIT" }, - "node_modules/@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/template/node_modules/@babel/types": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", - "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", - "dev": true, - "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz", - "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.16.7", - "@babel/generator": "^7.17.3", - "@babel/helper-environment-visitor": "^7.16.7", - "@babel/helper-function-name": "^7.16.7", - "@babel/helper-hoist-variables": "^7.16.7", - "@babel/helper-split-export-declaration": "^7.16.7", - "@babel/parser": "^7.17.3", - "@babel/types": "^7.17.0", - "debug": "^4.1.0", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/types": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz", - "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.16.7", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@develar/schema-utils": { "version": "2.6.5", "resolved": "https://registry.npmjs.org/@develar/schema-utils/-/schema-utils-2.6.5.tgz", @@ -1019,29 +822,6 @@ "node": ">= 10" } }, - "node_modules/@trivago/prettier-plugin-sort-imports": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.2.0.tgz", - "integrity": "sha512-YBepjbt+ZNBVmN3ev1amQH3lWCmHyt5qTbLCp/syXJRu/Kw2koXh44qayB1gMRxcL/gV8egmjN5xWSrYyfUtyw==", - "dev": true, - "dependencies": { - "@babel/generator": "7.17.7", - "@babel/parser": "^7.20.5", - "@babel/traverse": "7.17.3", - "@babel/types": "7.17.0", - "javascript-natural-sort": "0.7.1", - "lodash": "^4.17.21" - }, - "peerDependencies": { - "@vue/compiler-sfc": "3.x", - "prettier": "2.x - 3.x" - }, - "peerDependenciesMeta": { - "@vue/compiler-sfc": { - "optional": true - } - } - }, "node_modules/@types/body-parser": { "version": "1.19.2", "dev": true, @@ -4912,17 +4692,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint-config-prettier": { - "version": "8.5.0", - "dev": true, - "license": "MIT", - "bin": { - "eslint-config-prettier": "bin/cli.js" - }, - "peerDependencies": { - "eslint": ">=7.0.0" - } - }, "node_modules/eslint-plugin-react": { "version": "7.31.11", "dev": true, @@ -5991,15 +5760,6 @@ "node": ">=10" } }, - "node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/globalthis": { "version": "1.0.3", "license": "MIT", @@ -6980,12 +6740,6 @@ "node": ">=8" } }, - "node_modules/javascript-natural-sort": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz", - "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==", - "dev": true - }, "node_modules/jest-worker": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", @@ -7051,18 +6805,6 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true, - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/json-buffer": { "version": "3.0.1", "license": "MIT" @@ -12380,20 +12122,6 @@ "node": ">= 0.8.0" } }, - "node_modules/prettier": { - "version": "2.8.1", - "dev": true, - "license": "MIT", - "bin": { - "prettier": "bin-prettier.js" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, "node_modules/prismjs": { "version": "1.28.0", "license": "MIT", @@ -14524,15 +14252,6 @@ "node": ">=8.17.0" } }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", "dev": true, diff --git a/package.json b/package.json index aaf721d464..9e0ec44b64 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,7 @@ "main": "electron.js", "scripts": { "precommit": "npx lint-staged", - "lint": "eslint .", - "format": "prettier . --write", + "lint": "eslint .", "electron": "npx electron .", "electron-win": "npx electron.cmd .", "start:watch": "cross-env-shell webpack-dev-server --progress --mode=development --node-env=development --env SERVER_PORT=$SERVER_PORT --env DATA_PATH=$DATA_PATH --history-api-fallback --cache", @@ -64,7 +63,6 @@ "electron-builder": "^24.6.3", "electron-notarize": "^0.2.1", "eslint": "^8.29.0", - "eslint-config-prettier": "^8.5.0", "eslint-plugin-react": "^7.31.11", "husky": "^8.0.3", "license-checker": "^25.0.1", @@ -73,7 +71,6 @@ "npm": "^9.8.1", "npm-run-all": "^4.1.5", "patch-package": "^6.4.7", - "prettier": "^2.7.1", "sass": "^1.62.0", "sass-loader": "^8.0.2", "source-map-loader": "^0.2.4", @@ -154,9 +151,7 @@ { "name": "Anytype", "role": "Editor", - "schemes": [ - "anytype" - ] + "schemes": ["anytype"] } ], "asarUnpack": [ @@ -494,10 +489,7 @@ "entitlementsInherit": "electron/entitlements.mac.plist", "target": { "target": "default", - "arch": [ - "x64", - "arm64" - ] + "arch": ["x64", "arm64"] }, "identity": "J3NXTX3T5S", "category": "public.app-category.productivity", @@ -536,12 +528,7 @@ "linux": { "icon": "electron/img/icon512x512.png", "category": "Utility", - "target": [ - "snap", - "AppImage", - "deb", - "rpm" - ], + "target": ["snap", "AppImage", "deb", "rpm"], "description": "Anytype", "publish": [ { @@ -554,8 +541,7 @@ }, "lint-staged": { "{src,electron}/*.{ts,tsx}": "npx tsc --noEmit -p tsconfig.json", - "{src,electron}/*.{js,jsx,ts,tsx}": "npx eslint --fix", - "{src,electron}/*.{js,jsx,ts,tsx,html,css,scss,json}": "npx prettier --fix" + "{src,electron}/*.{js,jsx,ts,tsx}": "npx eslint --fix" }, "husky": { "hooks": {