From 1c04aa99634d11d2e6dfffcaf55fc5a39ee2b6a6 Mon Sep 17 00:00:00 2001 From: Panagiotis Papadopoulos Date: Sun, 2 Mar 2025 23:00:15 +0100 Subject: [PATCH 1/4] chore: add dprint config add initial dprint configuration, settings partially taken from the prettier config, still might need some finetuning --- .dprint.json | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .dprint.json diff --git a/.dprint.json b/.dprint.json new file mode 100644 index 000000000..21e6f8585 --- /dev/null +++ b/.dprint.json @@ -0,0 +1,44 @@ +{ + "typescript": { + "indentWidth": 4, + "quoteStyle": "preferDouble", + "semiColons": "prefer", + "quoteProps": "asNeeded", + "newLineKind": "lf", + "lineWidth": 200, + "trailingCommas": "never", + "arrayPattern.spaceAround": true, + "arrayExpression.spaceAround": true + }, + "json": { + }, + "markdown": { + }, + "dockerfile": { + }, + "malva": { + }, + "markup": { + }, + "yaml": { + }, + "excludes": [ + "**/node_modules", + "**/*-lock.json", + "*.html", + "*.md", + "*.yml", + "libraries/*", + "docs/*", + "src/public/app/doc_notes" + ], + "plugins": [ + "https://plugins.dprint.dev/typescript-0.94.0.wasm", + "https://plugins.dprint.dev/json-0.20.0.wasm", + "https://plugins.dprint.dev/markdown-0.18.0.wasm", + "https://plugins.dprint.dev/dockerfile-0.3.2.wasm", + "https://plugins.dprint.dev/g-plane/malva-v0.11.1.wasm", + "https://plugins.dprint.dev/g-plane/markup_fmt-v0.19.0.wasm", + "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.0.wasm" + ] +} From f965be9f8f77a38fb32eca7a17f4b1c8782500e1 Mon Sep 17 00:00:00 2001 From: Panagiotis Papadopoulos Date: Thu, 27 Mar 2025 21:24:51 +0100 Subject: [PATCH 2/4] deps: add dprint as devDep --- package-lock.json | 163 ++++++++++++++++++++++++++++++++++++++++++---- package.json | 1 + 2 files changed, 150 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index b8c7e54aa..b68b7c5d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -164,6 +164,7 @@ "bootstrap": "5.3.3", "cross-env": "7.0.3", "css-loader": "7.1.2", + "dprint": "0.49.1", "electron": "35.0.3", "eslint": "9.23.0", "esm": "3.2.25", @@ -175,7 +176,6 @@ "lorem-ipsum": "2.0.8", "mind-elixir": "4.4.3", "mini-css-extract-plugin": "2.9.2", - "node-abi": "4.2.0", "nodemon": "3.1.9", "postcss-loader": "8.1.1", "prettier": "3.5.3", @@ -568,6 +568,132 @@ "node": ">=14.17.0" } }, + "node_modules/@dprint/darwin-arm64": { + "version": "0.49.1", + "resolved": "https://registry.npmjs.org/@dprint/darwin-arm64/-/darwin-arm64-0.49.1.tgz", + "integrity": "sha512-ib6KcJWo/M5RJWXOQKhP664FG1hAvG7nrbkh+j8n+oXdzmbyDdXTP+zW+aM3/sIQUkGaZky1xy1j2VeScMEEHQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@dprint/darwin-x64": { + "version": "0.49.1", + "resolved": "https://registry.npmjs.org/@dprint/darwin-x64/-/darwin-x64-0.49.1.tgz", + "integrity": "sha512-vIVgnYxV7YYa1d6Uyz707RbgB9rwefGPam+rzaueFNPQjdOxPOTQDuMEJDS+Z3BlI00MfeoupIfIUGsXoM4dpQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@dprint/linux-arm64-glibc": { + "version": "0.49.1", + "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-glibc/-/linux-arm64-glibc-0.49.1.tgz", + "integrity": "sha512-ZeIh6qMPWLBBifDtU0XadpK36b4WoaTqCOt0rWKfoTjq1RAt78EgqETWp43Dbr6et/HvTgYdoWF0ZNEu2FJFFA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@dprint/linux-arm64-musl": { + "version": "0.49.1", + "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-musl/-/linux-arm64-musl-0.49.1.tgz", + "integrity": "sha512-/nuRyx+TykN6MqhlSCRs/t3o1XXlikiwTc9emWdzMeLGllYvJrcht9gRJ1/q1SqwCFhzgnD9H7roxxfji1tc+Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@dprint/linux-riscv64-glibc": { + "version": "0.49.1", + "resolved": "https://registry.npmjs.org/@dprint/linux-riscv64-glibc/-/linux-riscv64-glibc-0.49.1.tgz", + "integrity": "sha512-RHBqrnvGO+xW4Oh0QuToBqWtkXMcfjqa1TqbBFF03yopFzZA2oRKX83PhjTWgd/IglaOns0BgmaLJy/JBSxOfQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@dprint/linux-x64-glibc": { + "version": "0.49.1", + "resolved": "https://registry.npmjs.org/@dprint/linux-x64-glibc/-/linux-x64-glibc-0.49.1.tgz", + "integrity": "sha512-MjFE894mIQXOKBencuakKyzAI4KcDe/p0Y9lRp9YSw/FneR4QWH9VBH90h8fRxcIlWMArjFFJJAtsBnn5qgxeg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@dprint/linux-x64-musl": { + "version": "0.49.1", + "resolved": "https://registry.npmjs.org/@dprint/linux-x64-musl/-/linux-x64-musl-0.49.1.tgz", + "integrity": "sha512-CvGBWOksHgrL1uzYqtPFvZz0+E82BzgoCIEHJeuYaveEn37qWZS5jqoCm/vz6BfoivE1dVuyyOT78Begj9KxkQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@dprint/win32-arm64": { + "version": "0.49.1", + "resolved": "https://registry.npmjs.org/@dprint/win32-arm64/-/win32-arm64-0.49.1.tgz", + "integrity": "sha512-gQa4s82lMcXjfdxjWBQun6IJlXdPZZaIj2/2cqXWVEOYPKxAZ/JvGzt2pPG+i73h9KHjNLIV8M9ckqEH3oHufg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@dprint/win32-x64": { + "version": "0.49.1", + "resolved": "https://registry.npmjs.org/@dprint/win32-x64/-/win32-x64-0.49.1.tgz", + "integrity": "sha512-nPU6+hoVze5JJlgET7woYWElBw0IUaB/9XKTaglknQuUUfsmD75D9pkgJTxdIxl9Bg/i5O7c9wb3Nj4XNiTIfw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@electron-forge/cli": { "version": "7.8.0", "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-7.8.0.tgz", @@ -10087,6 +10213,28 @@ "url": "https://github.com/fb55/domutils?sponsor=1" } }, + "node_modules/dprint": { + "version": "0.49.1", + "resolved": "https://registry.npmjs.org/dprint/-/dprint-0.49.1.tgz", + "integrity": "sha512-pO9XH79SyXybj2Vhc9ITZMEI8cJkdlQQRoD8oEfPH6Jjpp/7WX5kIgECVd3DBOjjAdCSiW6R47v3gJBx/qZVkw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "dprint": "bin.js" + }, + "optionalDependencies": { + "@dprint/darwin-arm64": "0.49.1", + "@dprint/darwin-x64": "0.49.1", + "@dprint/linux-arm64-glibc": "0.49.1", + "@dprint/linux-arm64-musl": "0.49.1", + "@dprint/linux-riscv64-glibc": "0.49.1", + "@dprint/linux-x64-glibc": "0.49.1", + "@dprint/linux-x64-musl": "0.49.1", + "@dprint/win32-arm64": "0.49.1", + "@dprint/win32-x64": "0.49.1" + } + }, "node_modules/draggabilly": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/draggabilly/-/draggabilly-3.0.0.tgz", @@ -15977,19 +16125,6 @@ "dev": true, "license": "MIT" }, - "node_modules/node-abi": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-4.2.0.tgz", - "integrity": "sha512-admQxilhDcmFJbUl4LQzGu+QyEijW9rctKRH2P7LNavAvln1bdK9OcujM3yi2KysKI41dxTrDtp6QfGEZeCbkg==", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.6.3" - }, - "engines": { - "node": ">=22.12.0" - } - }, "node_modules/node-addon-api": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", diff --git a/package.json b/package.json index 57141ffa8..55ea7a87d 100644 --- a/package.json +++ b/package.json @@ -220,6 +220,7 @@ "bootstrap": "5.3.3", "cross-env": "7.0.3", "css-loader": "7.1.2", + "dprint": "0.49.1", "electron": "35.0.3", "eslint": "9.23.0", "esm": "3.2.25", From cdc6ce2118ffd72b0aeef35144159c93d6cd9bcb Mon Sep 17 00:00:00 2001 From: Panagiotis Papadopoulos Date: Thu, 27 Mar 2025 21:26:39 +0100 Subject: [PATCH 3/4] chore: remove prettier replaced by dprint due to its configurability --- .prettierignore | 6 ------ .prettierrc | 22 ---------------------- package-lock.json | 17 ----------------- package.json | 1 - 4 files changed, 46 deletions(-) delete mode 100644 .prettierignore delete mode 100644 .prettierrc diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index 5e1d8fad5..000000000 --- a/.prettierignore +++ /dev/null @@ -1,6 +0,0 @@ -*.html -*.md -*.yml -libraries/* -docs/* -src/public/app/doc_notes/**/* \ No newline at end of file diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index 036c81de1..000000000 --- a/.prettierrc +++ /dev/null @@ -1,22 +0,0 @@ -{ - "printWidth": 200, - "tabWidth": 4, - "useTabs": false, - "semi": true, - "singleQuote": false, - "quoteProps": "as-needed", - "trailingComma": "none", - "bracketSpacing": true, - "arrowParens": "always", - "proseWrap": "preserve", - "htmlWhitespaceSensitivity": "css", - "endOfLine": "lf", - "overrides": [ - { - "files": ["*.json"], - "options": { - "tabWidth": 2 - } - } - ] -} diff --git a/package-lock.json b/package-lock.json index b68b7c5d6..1d6021055 100644 --- a/package-lock.json +++ b/package-lock.json @@ -178,7 +178,6 @@ "mini-css-extract-plugin": "2.9.2", "nodemon": "3.1.9", "postcss-loader": "8.1.1", - "prettier": "3.5.3", "rcedit": "4.0.1", "rimraf": "6.0.1", "sass": "1.86.0", @@ -17535,22 +17534,6 @@ "node": ">= 0.8.0" } }, - "node_modules/prettier": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz", - "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==", - "dev": true, - "license": "MIT", - "bin": { - "prettier": "bin/prettier.cjs" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, "node_modules/proc-log": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-2.0.1.tgz", diff --git a/package.json b/package.json index 55ea7a87d..7a31dbe84 100644 --- a/package.json +++ b/package.json @@ -234,7 +234,6 @@ "mini-css-extract-plugin": "2.9.2", "nodemon": "3.1.9", "postcss-loader": "8.1.1", - "prettier": "3.5.3", "rcedit": "4.0.1", "rimraf": "6.0.1", "sass": "1.86.0", From e95172e2db4f9366514d69513730a646ed782f88 Mon Sep 17 00:00:00 2001 From: Panagiotis Papadopoulos Date: Thu, 27 Mar 2025 21:29:18 +0100 Subject: [PATCH 4/4] build(scripts): replace prettier with dprint also renaming the script from "dev:prettier" to a more "generic" term "dev:format" --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7a31dbe84..7ef7a8055 100644 --- a/package.json +++ b/package.json @@ -58,8 +58,8 @@ "test:integration-mem-db": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts", "test:integration-mem-db-dev": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts", "dev:watch-dist": "tsx ./bin/watch-dist.ts", - "dev:prettier-check": "prettier . --check", - "dev:prettier-fix": "prettier . --write", + "dev:format-check": "dprint check", + "dev:format-fix": "dprint fmt", "dev:linter-check": "eslint .", "dev:linter-fix": "eslint . --fix", "chore:update-build-info": "tsx bin/update-build-info.ts",