diff --git a/README.md b/README.md index 256c2dc59..09f2e3023 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # pl-fe +[![Codeberg Repo stars](https://img.shields.io/gitea/stars/mkljczk/pl-fe?gitea_url=https%3A%2F%2Fcodeberg.org&logo=Codeberg)](https://codeberg.org/mkljczk/pl-fe) [![GitHub Repo stars](https://img.shields.io/github/stars/mkljczk/pl-fe)](https://github.com/mkljczk/pl-fe) [![GitHub License](https://img.shields.io/github/license/mkljczk/pl-fe)](https://github.com/mkljczk/pl-fe?tab=AGPL-3.0-1-ov-file#readme) [![Weblate project translated](https://img.shields.io/weblate/progress/pl-fe)](https://hosted.weblate.org/engage/pl-fe/) @@ -47,7 +48,7 @@ More projects to be announced. ## Contributing -This project is hosted on [Codeberg](https://codeberg.org/mkljczk/pl-fe) and [GitHub](https://github.com/mkljczk/pl-fe). Most development currently happens on GitHub, but you can contribute on both platforms. +This project is hosted on [Codeberg](https://codeberg.org/mkljczk/pl-fe) and [GitHub](https://github.com/mkljczk/pl-fe). You can open issues on Codeberg or create merge requests on both platforms. Code contributions are welcome. I will provide contributing guidelines after I decide whether the current monorepo model is the correct approach. diff --git a/packages/pl-api/README.md b/packages/pl-api/README.md index e6da58530..e8bf4b29f 100644 --- a/packages/pl-api/README.md +++ b/packages/pl-api/README.md @@ -1,7 +1,7 @@ # `pl-api` -[![GitHub License](https://img.shields.io/github/license/mkljczk/pl-fe)](https://github.com/mkljczk/pl-fe?tab=AGPL-3.0-1-ov-file#readme) -[![NPM Version](https://img.shields.io/npm/v/pl-api) +[![NPM License](https://img.shields.io/npm/l/pl-api) +![NPM Version](https://img.shields.io/npm/v/pl-api) ![NPM Downloads](https://img.shields.io/npm/dw/pl-api)](https://www.npmjs.com/package/pl-api) A JavaScript library for interacting with Mastodon API-compatible servers, focused on support for projects extending the official Mastodon API. @@ -37,8 +37,8 @@ For unsupported projects, it falls back to a basic feature set, though every met ## Projects using `pl-api` -* [`pl-fe`](https://github.com/mkljczk/pl-fe/tree/develop/packages/pl-fe) is a web client for Mastodon-compatible servers forked from Soapbox. It uses `pl-api` for API interactions. -* [`pl-hooks`](https://github.com/mkljczk/pl-fe/tree/develop/packages/pl-hooks) is a work-in-progress library utilizing `pl-api`. +* [`pl-fe`](https://codeberg.org/mkljczk/pl-fe/src/branch/develop/packages/pl-fe) is a web client for Mastodon-compatible servers forked from Soapbox. It uses `pl-api` for API interactions. +* [`pl-hooks`](https://codeberg.org/mkljczk/pl-fe/src/branch/develop/packages/pl-hooks) is a work-in-progress library utilizing `pl-api`. If you are using `pl-api` in your project, please open a pull request with a link to the project. diff --git a/packages/pl-api/package.json b/packages/pl-api/package.json index 91c6ee7c4..1680b84b2 100644 --- a/packages/pl-api/package.json +++ b/packages/pl-api/package.json @@ -2,13 +2,13 @@ "name": "pl-api", "version": "1.0.0-rc.77", "type": "module", - "homepage": "https://github.com/mkljczk/pl-fe/tree/develop/packages/pl-api", + "homepage": "https://codeberg.org/mkljczk/pl-fe/src/branch/develop/packages/pl-api", "repository": { "type": "git", - "url": "git+https://github.com/mkljczk/pl-fe.git" + "url": "git+https://codeberg.org/mkljczk/pl-fe.git" }, "bugs": { - "url": "https://github.com/mkljczk/pl-fe/issues" + "url": "https://codeberg.org/mkljczk/pl-fe/issues" }, "scripts": { "dev": "vite", @@ -31,8 +31,8 @@ "eslint-plugin-compat": "6.0.2", "eslint-plugin-import": "^2.31.0", "eslint-plugin-promise": "^7.2.1", - "typedoc": "^0.27.8", - "typedoc-material-theme": "^1.3.0", + "typedoc": "^0.28.5", + "typedoc-material-theme": "^1.4.0", "typedoc-plugin-valibot": "^1.0.0", "typescript": "^5.7.3", "vite": "^6.3.3", diff --git a/packages/pl-api/yarn.lock b/packages/pl-api/yarn.lock index d193ea1da..364938d60 100644 --- a/packages/pl-api/yarn.lock +++ b/packages/pl-api/yarn.lock @@ -206,14 +206,16 @@ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2" integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q== -"@gerrit0/mini-shiki@^1.24.0": - version "1.24.4" - resolved "https://registry.yarnpkg.com/@gerrit0/mini-shiki/-/mini-shiki-1.24.4.tgz#e5328ca0dccc094460c03701d62158137a5a2eda" - integrity sha512-YEHW1QeAg6UmxEmswiQbOVEg1CW22b1XUD/lNTliOsu0LD0wqoyleFMnmbTp697QE0pcadQiR5cVtbbAPncvpw== +"@gerrit0/mini-shiki@^3.2.2": + version "3.6.0" + resolved "https://registry.yarnpkg.com/@gerrit0/mini-shiki/-/mini-shiki-3.6.0.tgz#5c9b7a87fee29faa64aace00733a1691c691a999" + integrity sha512-KaeJvPNofTEZR9EzVNp/GQzbQqkGfjiu6k3CXKvhVTX+8OoAKSX/k7qxLKOX3B0yh2XqVAc93rsOu48CGt2Qug== dependencies: - "@shikijs/engine-oniguruma" "^1.24.2" - "@shikijs/types" "^1.24.2" - "@shikijs/vscode-textmate" "^9.3.1" + "@shikijs/engine-oniguruma" "^3.6.0" + "@shikijs/langs" "^3.6.0" + "@shikijs/themes" "^3.6.0" + "@shikijs/types" "^3.6.0" + "@shikijs/vscode-textmate" "^10.0.2" "@humanwhocodes/config-array@^0.13.0": version "0.13.0" @@ -481,31 +483,40 @@ argparse "~1.0.9" string-argv "~0.3.1" -"@shikijs/engine-oniguruma@^1.24.2": - version "1.24.2" - resolved "https://registry.yarnpkg.com/@shikijs/engine-oniguruma/-/engine-oniguruma-1.24.2.tgz#90924001a17a2551a2a9073aed4af3767ce68b1b" - integrity sha512-ZN6k//aDNWRJs1uKB12pturKHh7GejKugowOFGAuG7TxDRLod1Bd5JhpOikOiFqPmKjKEPtEA6mRCf7q3ulDyQ== +"@shikijs/engine-oniguruma@^3.6.0": + version "3.6.0" + resolved "https://registry.yarnpkg.com/@shikijs/engine-oniguruma/-/engine-oniguruma-3.6.0.tgz#dce6074a258f1b349ff043eddba9779e76984769" + integrity sha512-nmOhIZ9yT3Grd+2plmW/d8+vZ2pcQmo/UnVwXMUXAKTXdi+LK0S08Ancrz5tQQPkxvjBalpMW2aKvwXfelauvA== dependencies: - "@shikijs/types" "1.24.2" - "@shikijs/vscode-textmate" "^9.3.0" + "@shikijs/types" "3.6.0" + "@shikijs/vscode-textmate" "^10.0.2" -"@shikijs/types@1.24.2", "@shikijs/types@^1.24.2": - version "1.24.2" - resolved "https://registry.yarnpkg.com/@shikijs/types/-/types-1.24.2.tgz#770313a0072a7c14ab1a130a36d02df7e4d87375" - integrity sha512-bdeWZiDtajGLG9BudI0AHet0b6e7FbR0EsE4jpGaI0YwHm/XJunI9+3uZnzFtX65gsyJ6ngCIWUfA4NWRPnBkQ== +"@shikijs/langs@^3.6.0": + version "3.6.0" + resolved "https://registry.yarnpkg.com/@shikijs/langs/-/langs-3.6.0.tgz#e3faea60e12c9bcdbebeeac14975c71f927bc7cb" + integrity sha512-IdZkQJaLBu1LCYCwkr30hNuSDfllOT8RWYVZK1tD2J03DkiagYKRxj/pDSl8Didml3xxuyzUjgtioInwEQM/TA== dependencies: - "@shikijs/vscode-textmate" "^9.3.0" + "@shikijs/types" "3.6.0" + +"@shikijs/themes@^3.6.0": + version "3.6.0" + resolved "https://registry.yarnpkg.com/@shikijs/themes/-/themes-3.6.0.tgz#6003780e033f9fec6b1336395a8994be17959e81" + integrity sha512-Fq2j4nWr1DF4drvmhqKq8x5vVQ27VncF8XZMBuHuQMZvUSS3NBgpqfwz/FoGe36+W6PvniZ1yDlg2d4kmYDU6w== + dependencies: + "@shikijs/types" "3.6.0" + +"@shikijs/types@3.6.0", "@shikijs/types@^3.6.0": + version "3.6.0" + resolved "https://registry.yarnpkg.com/@shikijs/types/-/types-3.6.0.tgz#0a4944724320eaa6f151d26d8f982a7f4a0b53ff" + integrity sha512-cLWFiToxYu0aAzJqhXTQsFiJRTFDAGl93IrMSBNaGSzs7ixkLfdG6pH11HipuWFGW5vyx4X47W8HDQ7eSrmBUg== + dependencies: + "@shikijs/vscode-textmate" "^10.0.2" "@types/hast" "^3.0.4" -"@shikijs/vscode-textmate@^9.3.0": - version "9.3.0" - resolved "https://registry.yarnpkg.com/@shikijs/vscode-textmate/-/vscode-textmate-9.3.0.tgz#b2f1776e488c1d6c2b6cd129bab62f71bbc9c7ab" - integrity sha512-jn7/7ky30idSkd/O5yDBfAnVt+JJpepofP/POZ1iMOxK59cOfqIgg/Dj0eFsjOTMw+4ycJN0uhZH/Eb0bs/EUA== - -"@shikijs/vscode-textmate@^9.3.1": - version "9.3.1" - resolved "https://registry.yarnpkg.com/@shikijs/vscode-textmate/-/vscode-textmate-9.3.1.tgz#afda31f8f42cab70a26f3603f52eae3f1c35d2f7" - integrity sha512-79QfK1393x9Ho60QFyLti+QfdJzRQCVLFb97kOIV7Eo9vQU/roINgk7m24uv0a7AUvN//RDH36FLjjK48v0s9g== +"@shikijs/vscode-textmate@^10.0.2": + version "10.0.2" + resolved "https://registry.yarnpkg.com/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz#a90ab31d0cc1dfb54c66a69e515bf624fa7b2224" + integrity sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg== "@stylistic/eslint-plugin@^3.1.0": version "3.1.0" @@ -2797,10 +2808,10 @@ typed-array-length@^1.0.6: is-typed-array "^1.1.13" possible-typed-array-names "^1.0.0" -typedoc-material-theme@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/typedoc-material-theme/-/typedoc-material-theme-1.3.0.tgz#93789743ebed61b3dba517e1f61d25c5deddd884" - integrity sha512-4vY68NUBBkMc3gKAltDtvT0KbIYX1uaFAT/3brDwhnUxhfTiYRtfg8VXR2lr8f+9VNDh7BfEtj8gpRO7Y93TWQ== +typedoc-material-theme@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/typedoc-material-theme/-/typedoc-material-theme-1.4.0.tgz#fc9acb41dc7bc99d127a4505f56acf8c7dda68f5" + integrity sha512-TBoBpX/4zWO6l74/wBLivXHC2rIiD70KXMliYrw1KhcqdybyxkVBLP5z8KiJuNV8aQIeS+rK2QG6GSucQHJQDQ== dependencies: "@material/material-color-utilities" "^0.3.0" @@ -2809,16 +2820,16 @@ typedoc-plugin-valibot@^1.0.0: resolved "https://registry.yarnpkg.com/typedoc-plugin-valibot/-/typedoc-plugin-valibot-1.0.0.tgz#9a7e586d993f5e6c9efe60ab12724e4fb24f7efe" integrity sha512-3LJSPc/aAKvxsfJx3/qgI1HBJvh4JNmtQYzcbxiQrVdiloIQwh4g0KtwvHV9CCl6gAnDxdnFMdE5gbhne2wXuw== -typedoc@^0.27.8: - version "0.27.8" - resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.27.8.tgz#9d4c4aa3c6889090d8fa4776367e353697d3e706" - integrity sha512-q0/2TUunNEDmWkn23ULKGXieK8cgGuAmBUXC/HcZ/rgzMI9Yr4Nq3in1K1vT1NZ9zx6M78yTk3kmIPbwJgK5KA== +typedoc@^0.28.5: + version "0.28.5" + resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.28.5.tgz#c6e1303fde05b746b3d2079621aff9c81561eccf" + integrity sha512-5PzUddaA9FbaarUzIsEc4wNXCiO4Ot3bJNeMF2qKpYlTmM9TTaSHQ7162w756ERCkXER/+o2purRG6YOAv6EMA== dependencies: - "@gerrit0/mini-shiki" "^1.24.0" + "@gerrit0/mini-shiki" "^3.2.2" lunr "^2.3.9" markdown-it "^14.1.0" minimatch "^9.0.5" - yaml "^2.6.1" + yaml "^2.7.1" typescript@5.7.2: version "5.7.2" @@ -2963,10 +2974,10 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yaml@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.1.tgz#42f2b1ba89203f374609572d5349fb8686500773" - integrity sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg== +yaml@^2.7.1: + version "2.8.0" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.0.tgz#15f8c9866211bdc2d3781a0890e44d4fa1a5fff6" + integrity sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ== yocto-queue@^0.1.0: version "0.1.0" diff --git a/packages/pl-fe/CHANGELOG.md b/packages/pl-fe/CHANGELOG.md index dce06ad60..345de91f4 100644 --- a/packages/pl-fe/CHANGELOG.md +++ b/packages/pl-fe/CHANGELOG.md @@ -6,7 +6,7 @@ Changes made since the project forked from Soapbox in April 2024. ### Major changes -- Switched to a separate library [`pl-api`](https://github.com/mkljczk/pl-fe/tree/develop/packages/pl-api) for Mastodon API integration. It is mostly written from scratch, inheriting minor code parts from Soapbox/Mastodon. This also comes with improved compatibility with various Mastodon API extensions and abstracts out the implementation details. +- Switched to a separate library [`pl-api`](https://codeberg.org/mkljczk/pl-fe/src/branch/develop/packages/pl-api) for Mastodon API integration. It is mostly written from scratch, inheriting minor code parts from Soapbox/Mastodon. This also comes with improved compatibility with various Mastodon API extensions and abstracts out the implementation details. ### Added diff --git a/packages/pl-fe/app.json b/packages/pl-fe/app.json index ecb40358d..15128b523 100644 --- a/packages/pl-fe/app.json +++ b/packages/pl-fe/app.json @@ -2,6 +2,6 @@ "name": "pl-fe", "description": "Mastodon-compatible social media front-end.", "keywords": ["fediverse"], - "website": "https://github.com/mkljczk/pl-fe", + "website": "https://codeberg.org/mkljczk/pl-fe", "stack": "container" } diff --git a/packages/pl-fe/package.json b/packages/pl-fe/package.json index c61f6c7e2..e96bc8454 100644 --- a/packages/pl-fe/package.json +++ b/packages/pl-fe/package.json @@ -4,17 +4,17 @@ "version": "0.0.1", "type": "module", "description": "Mastodon-compatible social media front-end", - "homepage": "https://github.com/mkljczk/pl-fe", + "homepage": "https://codeberg.org/mkljczk/pl-fe", "repository": { "type": "git", - "url": "https://github.com/mkljczk/pl-fe" + "url": "https://codeberg.org/mkljczk/pl-fe" }, "keywords": [ "fediverse", "pleroma" ], "bugs": { - "url": "https://github.com/mkljczk/pl-fe/issues" + "url": "https://codeberg.org/mkljczk/pl-fe/issues" }, "scripts": { "start": "npx vite serve", diff --git a/packages/pl-fe/src/locales/pl.json b/packages/pl-fe/src/locales/pl.json index 6f2e70c1f..db786a5bc 100644 --- a/packages/pl-fe/src/locales/pl.json +++ b/packages/pl-fe/src/locales/pl.json @@ -889,7 +889,7 @@ "generic.logo": "Logo", "generic.saved": "Zapisano", "getting_started.footer_notice": "Z dumą tworzone w Polsce. {emoji}", - "getting_started.open_source_notice": "{code_name} jest oprogramowaniem o otwartym źródle. Możesz pomóc w rozwoju lub zgłaszać błędy na GitHubie tutaj: {code_link} (v{code_version}).", + "getting_started.open_source_notice": "{code_name} jest oprogramowaniem o otwartym źródle. Możesz pomóc w rozwoju lub zgłaszać błędy na Codebergu tutaj: {code_link} (v{code_version}).", "group.cancel_request": "Anuluj zgłoszenie", "group.delete.success": "Pomyślnie usunięto grupę", "group.demote.user.success": "@{name} jest teraz członkiem", diff --git a/packages/pl-fe/src/pages/developers/create-app.tsx b/packages/pl-fe/src/pages/developers/create-app.tsx index ce72649e0..a2cef1a2a 100644 --- a/packages/pl-fe/src/pages/developers/create-app.tsx +++ b/packages/pl-fe/src/pages/developers/create-app.tsx @@ -166,7 +166,7 @@ const CreateAppPage: React.FC = () => { }> @@ -175,7 +175,7 @@ const CreateAppPage: React.FC = () => { }>