From ca19f2f2ed27e3ddb88bbdfe5ddb5dee61d7a0a9 Mon Sep 17 00:00:00 2001 From: vorotamoroz Date: Wed, 10 Dec 2025 09:47:31 +0000 Subject: [PATCH] Modify build script and prettier config type (.prettierrc to .prettierrc.mjs --- .gitignore | 3 +++ .prettierrc | 7 ------- .prettierrc.mjs | 20 ++++++++++++++++++++ eslint.config.mjs | 5 ++++- package.json | 8 ++++---- 5 files changed, 31 insertions(+), 12 deletions(-) delete mode 100644 .prettierrc create mode 100644 .prettierrc.mjs diff --git a/.gitignore b/.gitignore index 0394ccf..abd4e17 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ data.json # environment variables .env + +# local config files +*.local \ No newline at end of file diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index 92a539a..0000000 --- a/.prettierrc +++ /dev/null @@ -1,7 +0,0 @@ -{ - "trailingComma": "es5", - "tabWidth": 4, - "printWidth": 120, - "semi": true, - "endOfLine": "lf" -} diff --git a/.prettierrc.mjs b/.prettierrc.mjs new file mode 100644 index 0000000..d0c0d3e --- /dev/null +++ b/.prettierrc.mjs @@ -0,0 +1,20 @@ +import { readFileSync } from "fs"; +let localPrettierConfig = {}; + +try { + const localConfig = readFileSync(".prettierrc.local", "utf-8"); + localPrettierConfig = JSON.parse(localConfig); + console.log("Using local Prettier config from .prettierrc.local"); +} catch (e) { + // no local config +} +const prettierConfig = { + trailingComma: "es5", + tabWidth: 4, + printWidth: 120, + semi: true, + endOfLine: "cr", + ...localPrettierConfig, +}; + +export default prettierConfig; diff --git a/eslint.config.mjs b/eslint.config.mjs index 98e8f50..7dd29b2 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -40,7 +40,10 @@ export default [ "src/lib/test", "src/lib/src/cli", "**/main.js", - "src/lib/apps/webpeer/*" + "src/lib/apps/webpeer/*", + ".prettierrc.*.mjs", + ".prettierrc.mjs", + "*.config.mjs" ], }, ...compat.extends( diff --git a/package.json b/package.json index 500631c..fd970d0 100644 --- a/package.json +++ b/package.json @@ -5,12 +5,12 @@ "main": "main.js", "type": "module", "scripts": { - "bakei18n": "npx tsx ./src/lib/_tools/bakei18n.ts", + "bakei18n": "npm run i18n:yaml2json && npm run i18n:bakejson", "i18n:bakejson": "npx tsx ./src/lib/_tools/bakei18n.ts", "i18n:yaml2json": "npx tsx ./src/lib/_tools/yaml2json.ts", "i18n:json2yaml": "npx tsx ./src/lib/_tools/json2yaml.ts", - "prettyjson": "prettier --config ./.prettierrc ./src/lib/src/common/messagesJson/*.json --write --log-level error", - "postbakei18n": "prettier --config ./.prettierrc ./src/lib/src/common/messages/*.ts --write --log-level error", + "prettyjson": "prettier --config ./.prettierrc.mjs ./src/lib/src/common/messagesJson/*.json --write --log-level error", + "postbakei18n": "prettier --config ./.prettierrc.mjs ./src/lib/src/common/messages/*.ts --write --log-level error", "posti18n:yaml2json": "npm run prettyjson", "predev": "npm run bakei18n", "dev": "node --env-file=.env esbuild.config.mjs", @@ -22,7 +22,7 @@ "tsc-check": "tsc --noEmit", "pretty": "npm run prettyNoWrite -- --write --log-level error", "prettyCheck": "npm run prettyNoWrite -- --check", - "prettyNoWrite": "prettier --config ./.prettierrc \"**/*.js\" \"**/*.ts\" \"**/*.json\" ", + "prettyNoWrite": "prettier --config ./.prettierrc.mjs \"**/*.js\" \"**/*.ts\" \"**/*.json\" ", "check": "npm run lint && npm run svelte-check", "unittest": "deno test -A --no-check --coverage=cov_profile --v8-flags=--expose-gc --trace-leaks ./src/" },