From badac466a8b20527ee4f7154cd2e9666b33c840b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Fri, 9 Sep 2022 15:52:19 +0100 Subject: [PATCH] add akkoma frontend --- .drone.yml | 4 +- akkoma/akkoma.patch | 895 ++++++++++++++++++++++++++++++++++++++++++++ akkoma/default.nix | 28 +- flake.lock | 34 ++ flake.nix | 4 + 5 files changed, 961 insertions(+), 4 deletions(-) create mode 100644 akkoma/akkoma.patch diff --git a/.drone.yml b/.drone.yml index 65bc399..7141594 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,10 +15,10 @@ steps: - (cd minecraft && bash ./update.sh) depends_on: - Update flake - - name: Update mastodon-glitch + - name: Update akkoma image: nixos/nix commands: - - (cd mastodon && ./update.sh) + - (cd akkoma && ./update.sh) environment: USER: nobody depends_on: diff --git a/akkoma/akkoma.patch b/akkoma/akkoma.patch new file mode 100644 index 0000000..7bd9689 --- /dev/null +++ b/akkoma/akkoma.patch @@ -0,0 +1,895 @@ +diff --git a/package.json b/package.json +index f267be19..0d5c2ead 100644 +--- a/package.json ++++ b/package.json +@@ -32,7 +32,8 @@ + "url": "git+https://akkoma.dev/AkkomaGang/admin-fe.git" + }, + "resolutions": { +- "prosemirror-model": "1.9.1" ++ "eve": "https://github.com/adobe-webplatform/eve.git", ++ "raphael": "https://github.com/nhn/raphael.git#78a6ed3ec269f33b6457b0ec66f8c3d1f2ed70e0" + }, + "bugs": { + "url": "https://akkoma.dev/AkkomaGang/admin-fe/-/issues" +@@ -47,6 +48,7 @@ + "dropzone": "5.2.0", + "echarts": "4.1.0", + "element-ui": "^2.13.0", ++ "eve": "https://github.com/adobe-webplatform/eve.git", + "file-saver": "1.3.8", + "fuse.js": "3.4.2", + "js-cookie": "2.2.0", +diff --git a/yarn.lock b/yarn.lock +index c0c318f7..c767b87b 100644 +--- a/yarn.lock ++++ b/yarn.lock +@@ -24,26 +24,26 @@ + dependencies: + "@babel/highlight" "^7.18.6" + +-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8": +- version "7.18.13" +- resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.13.tgz#6aff7b350a1e8c3e40b029e46cbe78e24a913483" +- integrity sha512-5yUzC5LqyTFp2HLmDoxGQelcdYgSpP9xsnMWBphAscOdFrHSAVbLNzWiy32sVNDqJRDiJK6klfDnAgu6PAGSHw== ++"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8", "@babel/compat-data@^7.19.0": ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.0.tgz#2a592fd89bacb1fcde68de31bee4f2f2dacb0e86" ++ integrity sha512-y5rqgTTPTmaF5e2nVhOxw+Ur9HDJLsWb6U/KpgUzRZEdPfE6VOubXBKLdbcUTijzRptednSBDQbYZBOSqJxpJw== + + "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.3.4", "@babel/core@^7.7.5": +- version "7.18.13" +- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.13.tgz#9be8c44512751b05094a4d3ab05fc53a47ce00ac" +- integrity sha512-ZisbOvRRusFktksHSG6pjj1CSvkPkcZq/KHD45LAkVP/oiHJkNBZWfpvlLmX8OtHDG8IuzsFlVRWo08w7Qxn0A== ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.0.tgz#d2f5f4f2033c00de8096be3c9f45772563e150c3" ++ integrity sha512-reM4+U7B9ss148rh2n1Qs9ASS+w94irYXga7c2jaQv9RVzpS7Mv1a9rnYYwuDa45G+DkORt9g6An2k/V4d9LbQ== + dependencies: + "@ampproject/remapping" "^2.1.0" + "@babel/code-frame" "^7.18.6" +- "@babel/generator" "^7.18.13" +- "@babel/helper-compilation-targets" "^7.18.9" +- "@babel/helper-module-transforms" "^7.18.9" +- "@babel/helpers" "^7.18.9" +- "@babel/parser" "^7.18.13" ++ "@babel/generator" "^7.19.0" ++ "@babel/helper-compilation-targets" "^7.19.0" ++ "@babel/helper-module-transforms" "^7.19.0" ++ "@babel/helpers" "^7.19.0" ++ "@babel/parser" "^7.19.0" + "@babel/template" "^7.18.10" +- "@babel/traverse" "^7.18.13" +- "@babel/types" "^7.18.13" ++ "@babel/traverse" "^7.19.0" ++ "@babel/types" "^7.19.0" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" +@@ -61,12 +61,12 @@ + source-map "^0.5.0" + trim-right "^1.0.1" + +-"@babel/generator@^7.18.13": +- version "7.18.13" +- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.13.tgz#59550cbb9ae79b8def15587bdfbaa388c4abf212" +- integrity sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ== ++"@babel/generator@^7.19.0": ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.0.tgz#785596c06425e59334df2ccee63ab166b738419a" ++ integrity sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg== + dependencies: +- "@babel/types" "^7.18.13" ++ "@babel/types" "^7.19.0" + "@jridgewell/gen-mapping" "^0.3.2" + jsesc "^2.5.1" + +@@ -85,33 +85,33 @@ + "@babel/helper-explode-assignable-expression" "^7.18.6" + "@babel/types" "^7.18.9" + +-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9": +- version "7.18.9" +- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz#69e64f57b524cde3e5ff6cc5a9f4a387ee5563bf" +- integrity sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg== ++"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.19.0": ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.0.tgz#537ec8339d53e806ed422f1e06c8f17d55b96bb0" ++ integrity sha512-Ai5bNWXIvwDvWM7njqsG3feMlL9hCVQsPYXodsZyLwshYkZVJt59Gftau4VrE8S9IT9asd2uSP1hG6wCNw+sXA== + dependencies: +- "@babel/compat-data" "^7.18.8" ++ "@babel/compat-data" "^7.19.0" + "@babel/helper-validator-option" "^7.18.6" + browserslist "^4.20.2" + semver "^6.3.0" + + "@babel/helper-create-class-features-plugin@^7.18.6": +- version "7.18.13" +- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.13.tgz#63e771187bd06d234f95fdf8bd5f8b6429de6298" +- integrity sha512-hDvXp+QYxSRL+23mpAlSGxHMDyIGChm0/AwTfTAAK5Ufe40nCsyNdaYCGuK91phn/fVu9kqayImRDkvNAgdrsA== ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz#bfd6904620df4e46470bae4850d66be1054c404b" ++ integrity sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-environment-visitor" "^7.18.9" +- "@babel/helper-function-name" "^7.18.9" ++ "@babel/helper-function-name" "^7.19.0" + "@babel/helper-member-expression-to-functions" "^7.18.9" + "@babel/helper-optimise-call-expression" "^7.18.6" + "@babel/helper-replace-supers" "^7.18.9" + "@babel/helper-split-export-declaration" "^7.18.6" + +-"@babel/helper-create-regexp-features-plugin@^7.18.6": +- version "7.18.6" +- resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz#3e35f4e04acbbf25f1b3534a657610a000543d3c" +- integrity sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A== ++"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.19.0": ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz#7976aca61c0984202baca73d84e2337a5424a41b" ++ integrity sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + regexpu-core "^5.1.0" +@@ -149,13 +149,13 @@ + "@babel/template" "7.0.0-beta.44" + "@babel/types" "7.0.0-beta.44" + +-"@babel/helper-function-name@^7.18.9": +- version "7.18.9" +- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0" +- integrity sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A== ++"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0": ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" ++ integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== + dependencies: +- "@babel/template" "^7.18.6" +- "@babel/types" "^7.18.9" ++ "@babel/template" "^7.18.10" ++ "@babel/types" "^7.19.0" + + "@babel/helper-get-function-arity@7.0.0-beta.44": + version "7.0.0-beta.44" +@@ -185,19 +185,19 @@ + dependencies: + "@babel/types" "^7.18.6" + +-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.18.9": +- version "7.18.9" +- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz#5a1079c005135ed627442df31a42887e80fcb712" +- integrity sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g== ++"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.0": ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz#309b230f04e22c58c6a2c0c0c7e50b216d350c30" ++ integrity sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ== + dependencies: + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-simple-access" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-validator-identifier" "^7.18.6" +- "@babel/template" "^7.18.6" +- "@babel/traverse" "^7.18.9" +- "@babel/types" "^7.18.9" ++ "@babel/template" "^7.18.10" ++ "@babel/traverse" "^7.19.0" ++ "@babel/types" "^7.19.0" + + "@babel/helper-optimise-call-expression@^7.18.6": + version "7.18.6" +@@ -206,10 +206,10 @@ + dependencies: + "@babel/types" "^7.18.6" + +-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": +- version "7.18.9" +- resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f" +- integrity sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w== ++"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf" ++ integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw== + + "@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9": + version "7.18.9" +@@ -276,23 +276,23 @@ + integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== + + "@babel/helper-wrap-function@^7.18.9": +- version "7.18.11" +- resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz#bff23ace436e3f6aefb61f85ffae2291c80ed1fb" +- integrity sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w== ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz#89f18335cff1152373222f76a4b37799636ae8b1" ++ integrity sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg== + dependencies: +- "@babel/helper-function-name" "^7.18.9" ++ "@babel/helper-function-name" "^7.19.0" + "@babel/template" "^7.18.10" +- "@babel/traverse" "^7.18.11" +- "@babel/types" "^7.18.10" ++ "@babel/traverse" "^7.19.0" ++ "@babel/types" "^7.19.0" + +-"@babel/helpers@^7.18.9": +- version "7.18.9" +- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.9.tgz#4bef3b893f253a1eced04516824ede94dcfe7ff9" +- integrity sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ== ++"@babel/helpers@^7.19.0": ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.0.tgz#f30534657faf246ae96551d88dd31e9d1fa1fc18" ++ integrity sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg== + dependencies: +- "@babel/template" "^7.18.6" +- "@babel/traverse" "^7.18.9" +- "@babel/types" "^7.18.9" ++ "@babel/template" "^7.18.10" ++ "@babel/traverse" "^7.19.0" ++ "@babel/types" "^7.19.0" + + "@babel/highlight@7.0.0-beta.44": + version "7.0.0-beta.44" +@@ -312,10 +312,10 @@ + chalk "^2.0.0" + js-tokens "^4.0.0" + +-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.13", "@babel/parser@^7.18.4": +- version "7.18.13" +- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.13.tgz#5b2dd21cae4a2c5145f1fbd8ca103f9313d3b7e4" +- integrity sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg== ++"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.4", "@babel/parser@^7.19.0": ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.0.tgz#497fcafb1d5b61376959c1c338745ef0577aa02c" ++ integrity sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw== + + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": + version "7.18.6" +@@ -333,13 +333,13 @@ + "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" + "@babel/plugin-proposal-optional-chaining" "^7.18.9" + +-"@babel/plugin-proposal-async-generator-functions@^7.18.10": +- version "7.18.10" +- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz#85ea478c98b0095c3e4102bff3b67d306ed24952" +- integrity sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew== ++"@babel/plugin-proposal-async-generator-functions@^7.19.0": ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.0.tgz#cf5740194f170467df20581712400487efc79ff1" ++ integrity sha512-nhEByMUTx3uZueJ/QkJuSlCfN4FGg+xy+vRsfGQGzSauq5ks2Deid2+05Q3KhfaUjvec1IGhw/Zm3cFm8JigTQ== + dependencies: + "@babel/helper-environment-visitor" "^7.18.9" +- "@babel/helper-plugin-utils" "^7.18.9" ++ "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-remap-async-to-generator" "^7.18.9" + "@babel/plugin-syntax-async-generators" "^7.8.4" + +@@ -618,16 +618,17 @@ + dependencies: + "@babel/helper-plugin-utils" "^7.18.9" + +-"@babel/plugin-transform-classes@^7.18.9": +- version "7.18.9" +- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz#90818efc5b9746879b869d5ce83eb2aa48bbc3da" +- integrity sha512-EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g== ++"@babel/plugin-transform-classes@^7.19.0": ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz#0e61ec257fba409c41372175e7c1e606dc79bb20" ++ integrity sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A== + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" ++ "@babel/helper-compilation-targets" "^7.19.0" + "@babel/helper-environment-visitor" "^7.18.9" +- "@babel/helper-function-name" "^7.18.9" ++ "@babel/helper-function-name" "^7.19.0" + "@babel/helper-optimise-call-expression" "^7.18.6" +- "@babel/helper-plugin-utils" "^7.18.9" ++ "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-replace-supers" "^7.18.9" + "@babel/helper-split-export-declaration" "^7.18.6" + globals "^11.1.0" +@@ -639,7 +640,7 @@ + dependencies: + "@babel/helper-plugin-utils" "^7.18.9" + +-"@babel/plugin-transform-destructuring@^7.18.9": ++"@babel/plugin-transform-destructuring@^7.18.13": + version "7.18.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz#9e03bc4a94475d62b7f4114938e6c5c33372cbf5" + integrity sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow== +@@ -718,14 +719,14 @@ + "@babel/helper-simple-access" "^7.18.6" + babel-plugin-dynamic-import-node "^2.3.3" + +-"@babel/plugin-transform-modules-systemjs@^7.18.9": +- version "7.18.9" +- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz#545df284a7ac6a05125e3e405e536c5853099a06" +- integrity sha512-zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A== ++"@babel/plugin-transform-modules-systemjs@^7.19.0": ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz#5f20b471284430f02d9c5059d9b9a16d4b085a1f" ++ integrity sha512-x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A== + dependencies: + "@babel/helper-hoist-variables" "^7.18.6" +- "@babel/helper-module-transforms" "^7.18.9" +- "@babel/helper-plugin-utils" "^7.18.9" ++ "@babel/helper-module-transforms" "^7.19.0" ++ "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-validator-identifier" "^7.18.6" + babel-plugin-dynamic-import-node "^2.3.3" + +@@ -737,13 +738,13 @@ + "@babel/helper-module-transforms" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" + +-"@babel/plugin-transform-named-capturing-groups-regex@^7.18.6": +- version "7.18.6" +- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz#c89bfbc7cc6805d692f3a49bc5fc1b630007246d" +- integrity sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg== ++"@babel/plugin-transform-named-capturing-groups-regex@^7.19.0": ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.0.tgz#58c52422e4f91a381727faed7d513c89d7f41ada" ++ integrity sha512-HDSuqOQzkU//kfGdiHBt71/hkDTApw4U/cMVgKgX7PqfB3LOaK+2GtCEsBu1dL9CkswDm0Gwehht1dCr421ULQ== + dependencies: +- "@babel/helper-create-regexp-features-plugin" "^7.18.6" +- "@babel/helper-plugin-utils" "^7.18.6" ++ "@babel/helper-create-regexp-features-plugin" "^7.19.0" ++ "@babel/helper-plugin-utils" "^7.19.0" + + "@babel/plugin-transform-new-target@^7.18.6": + version "7.18.6" +@@ -808,12 +809,12 @@ + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + +-"@babel/plugin-transform-spread@^7.18.9": +- version "7.18.9" +- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz#6ea7a6297740f381c540ac56caf75b05b74fb664" +- integrity sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA== ++"@babel/plugin-transform-spread@^7.19.0": ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6" ++ integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w== + dependencies: +- "@babel/helper-plugin-utils" "^7.18.9" ++ "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" + + "@babel/plugin-transform-sticky-regex@^7.18.6": +@@ -853,17 +854,17 @@ + "@babel/helper-plugin-utils" "^7.18.6" + + "@babel/preset-env@^7.3.4": +- version "7.18.10" +- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.10.tgz#83b8dfe70d7eea1aae5a10635ab0a5fe60dfc0f4" +- integrity sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA== ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.19.0.tgz#fd18caf499a67d6411b9ded68dc70d01ed1e5da7" ++ integrity sha512-1YUju1TAFuzjIQqNM9WsF4U6VbD/8t3wEAlw3LFYuuEr+ywqLRcSXxFKz4DCEj+sN94l/XTDiUXYRrsvMpz9WQ== + dependencies: +- "@babel/compat-data" "^7.18.8" +- "@babel/helper-compilation-targets" "^7.18.9" +- "@babel/helper-plugin-utils" "^7.18.9" ++ "@babel/compat-data" "^7.19.0" ++ "@babel/helper-compilation-targets" "^7.19.0" ++ "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-validator-option" "^7.18.6" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9" +- "@babel/plugin-proposal-async-generator-functions" "^7.18.10" ++ "@babel/plugin-proposal-async-generator-functions" "^7.19.0" + "@babel/plugin-proposal-class-properties" "^7.18.6" + "@babel/plugin-proposal-class-static-block" "^7.18.6" + "@babel/plugin-proposal-dynamic-import" "^7.18.6" +@@ -897,9 +898,9 @@ + "@babel/plugin-transform-async-to-generator" "^7.18.6" + "@babel/plugin-transform-block-scoped-functions" "^7.18.6" + "@babel/plugin-transform-block-scoping" "^7.18.9" +- "@babel/plugin-transform-classes" "^7.18.9" ++ "@babel/plugin-transform-classes" "^7.19.0" + "@babel/plugin-transform-computed-properties" "^7.18.9" +- "@babel/plugin-transform-destructuring" "^7.18.9" ++ "@babel/plugin-transform-destructuring" "^7.18.13" + "@babel/plugin-transform-dotall-regex" "^7.18.6" + "@babel/plugin-transform-duplicate-keys" "^7.18.9" + "@babel/plugin-transform-exponentiation-operator" "^7.18.6" +@@ -909,9 +910,9 @@ + "@babel/plugin-transform-member-expression-literals" "^7.18.6" + "@babel/plugin-transform-modules-amd" "^7.18.6" + "@babel/plugin-transform-modules-commonjs" "^7.18.6" +- "@babel/plugin-transform-modules-systemjs" "^7.18.9" ++ "@babel/plugin-transform-modules-systemjs" "^7.19.0" + "@babel/plugin-transform-modules-umd" "^7.18.6" +- "@babel/plugin-transform-named-capturing-groups-regex" "^7.18.6" ++ "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.0" + "@babel/plugin-transform-new-target" "^7.18.6" + "@babel/plugin-transform-object-super" "^7.18.6" + "@babel/plugin-transform-parameters" "^7.18.8" +@@ -919,14 +920,14 @@ + "@babel/plugin-transform-regenerator" "^7.18.6" + "@babel/plugin-transform-reserved-words" "^7.18.6" + "@babel/plugin-transform-shorthand-properties" "^7.18.6" +- "@babel/plugin-transform-spread" "^7.18.9" ++ "@babel/plugin-transform-spread" "^7.19.0" + "@babel/plugin-transform-sticky-regex" "^7.18.6" + "@babel/plugin-transform-template-literals" "^7.18.9" + "@babel/plugin-transform-typeof-symbol" "^7.18.9" + "@babel/plugin-transform-unicode-escapes" "^7.18.10" + "@babel/plugin-transform-unicode-regex" "^7.18.6" + "@babel/preset-modules" "^0.1.5" +- "@babel/types" "^7.18.10" ++ "@babel/types" "^7.19.0" + babel-plugin-polyfill-corejs2 "^0.3.2" + babel-plugin-polyfill-corejs3 "^0.5.3" + babel-plugin-polyfill-regenerator "^0.4.0" +@@ -945,9 +946,9 @@ + esutils "^2.0.2" + + "@babel/runtime@^7.3.4", "@babel/runtime@^7.8.4": +- version "7.18.9" +- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.9.tgz#b4fcfce55db3d2e5e080d2490f608a3b9f407f4a" +- integrity sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw== ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259" ++ integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA== + dependencies: + regenerator-runtime "^0.13.4" + +@@ -961,7 +962,7 @@ + babylon "7.0.0-beta.44" + lodash "^4.2.0" + +-"@babel/template@^7.18.10", "@babel/template@^7.18.6", "@babel/template@^7.3.3": ++"@babel/template@^7.18.10", "@babel/template@^7.3.3": + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" + integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA== +@@ -986,19 +987,19 @@ + invariant "^2.2.0" + lodash "^4.2.0" + +-"@babel/traverse@^7.1.0", "@babel/traverse@^7.18.11", "@babel/traverse@^7.18.13", "@babel/traverse@^7.18.9": +- version "7.18.13" +- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.13.tgz#5ab59ef51a997b3f10c4587d648b9696b6cb1a68" +- integrity sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA== ++"@babel/traverse@^7.1.0", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.0": ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.0.tgz#eb9c561c7360005c592cc645abafe0c3c4548eed" ++ integrity sha512-4pKpFRDh+utd2mbRC8JLnlsMUii3PMHjpL6a0SZ4NMZy7YFP9aXORxEhdMVOc9CpWtDF09IkciQLEhK7Ml7gRA== + dependencies: + "@babel/code-frame" "^7.18.6" +- "@babel/generator" "^7.18.13" ++ "@babel/generator" "^7.19.0" + "@babel/helper-environment-visitor" "^7.18.9" +- "@babel/helper-function-name" "^7.18.9" ++ "@babel/helper-function-name" "^7.19.0" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" +- "@babel/parser" "^7.18.13" +- "@babel/types" "^7.18.13" ++ "@babel/parser" "^7.19.0" ++ "@babel/types" "^7.19.0" + debug "^4.1.0" + globals "^11.1.0" + +@@ -1011,10 +1012,10 @@ + lodash "^4.2.0" + to-fast-properties "^2.0.0" + +-"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": +- version "7.18.13" +- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.13.tgz#30aeb9e514f4100f7c1cb6e5ba472b30e48f519a" +- integrity sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ== ++"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": ++ version "7.19.0" ++ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.0.tgz#75f21d73d73dc0351f3368d28db73465f4814600" ++ integrity sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA== + dependencies: + "@babel/helper-string-parser" "^7.18.10" + "@babel/helper-validator-identifier" "^7.18.6" +@@ -1324,9 +1325,9 @@ + "@babel/types" "^7.0.0" + + "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": +- version "7.18.0" +- resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.0.tgz#8134fd78cb39567465be65b9fdc16d378095f41f" +- integrity sha512-v4Vwdko+pgymgS+A2UIaJru93zQd85vIGWObM5ekZNdXCKtDYqATlEYnWgfo86Q6I1Lh0oXnksDnMU1cwmlPDw== ++ version "7.18.1" ++ resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.1.tgz#ce5e2c8c272b99b7a9fd69fa39f0b4cd85028bd9" ++ integrity sha512-FSdLaZh2UxaMuLp9lixWaHq/golWTRWOnRsAXzDTDSDOQLuZb1nsdCt6pJSPWSEQt2eFZ2YVk3oYhn+1kLMeMA== + dependencies: + "@babel/types" "^7.3.0" + +@@ -1371,9 +1372,9 @@ + integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== + + "@types/minimatch@*": +- version "5.1.0" +- resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.0.tgz#c3018161691376002f8a22ebb87f341e0dba3219" +- integrity sha512-0RJHq5FqDWo17kdHe+SMDJLfxmLaqHbWnqZ6gNKzDvStUlrmx/eKIY17+ifLS1yybo7X86aUshQMlittDOVNnw== ++ version "5.1.2" ++ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" ++ integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== + + "@types/minimist@^1.2.0": + version "1.2.2" +@@ -1381,9 +1382,9 @@ + integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== + + "@types/node@*": +- version "18.7.13" +- resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.13.tgz#23e6c5168333480d454243378b69e861ab5c011a" +- integrity sha512-46yIhxSe5xEaJZXWdIBP7GU4HDTG8/eo0qd9atdiL+lFpA03y8KS+lkTN834TWJj5767GbWv4n/P6efyTFt1Dw== ++ version "18.7.16" ++ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.16.tgz#0eb3cce1e37c79619943d2fd903919fc30850601" ++ integrity sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg== + + "@types/normalize-package-data@^2.4.0": + version "2.4.1" +@@ -2830,9 +2831,9 @@ caniuse-api@^3.0.0: + lodash.uniq "^4.5.0" + + caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000839, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001370: +- version "1.0.30001384" +- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001384.tgz#029527c2d781a3cfef13fa63b3a78a6088e35973" +- integrity sha512-BBWt57kqWbc0GYZXb47wTXpmAgqr5LSibPzNjk/AWMdmJMQhLqOl3c/Kd4OAU/tu4NLfYkMx8Tlq3RVBkOBolQ== ++ version "1.0.30001393" ++ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001393.tgz#1aa161e24fe6af2e2ccda000fc2b94be0b0db356" ++ integrity sha512-N/od11RX+Gsk+1qY/jbPa0R6zJupEa0lxeBG598EbrtblxVCTJsQwbRBm6+V+rxpc5lHKdsXb9RY83cZIPLseA== + + capture-exit@^2.0.0: + version "2.0.0" +@@ -3411,12 +3412,11 @@ copy-webpack-plugin@4.5.2: + serialize-javascript "^1.4.0" + + core-js-compat@^3.21.0, core-js-compat@^3.22.1: +- version "3.25.0" +- resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.25.0.tgz#489affbfbf9cb3fa56192fe2dd9ebaee985a66c5" +- integrity sha512-extKQM0g8/3GjFx9US12FAgx8KJawB7RCQ5y8ipYLbmfzEzmFRWdDjIlxDx82g7ygcNG85qMVUSRyABouELdow== ++ version "3.25.1" ++ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.25.1.tgz#6f13a90de52f89bbe6267e5620a412c7f7ff7e42" ++ integrity sha512-pOHS7O0i8Qt4zlPW/eIFjwp+NrTPx+wTL0ctgI2fHn31sZOq89rDsmtc/A2vAX7r6shl+bmVI+678He46jgBlw== + dependencies: + browserslist "^4.21.3" +- semver "7.0.0" + + core-js@^2.4.0: + version "2.6.12" +@@ -3424,9 +3424,9 @@ core-js@^2.4.0: + integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== + + core-js@^3.6.4: +- version "3.25.0" +- resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.0.tgz#be71d9e0dd648ffd70c44a7ec2319d039357eceb" +- integrity sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA== ++ version "3.25.1" ++ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.1.tgz#5818e09de0db8956e16bf10e2a7141e931b7c69c" ++ integrity sha512-sr0FY4lnO1hkQ4gLDr24K0DGnweGO1QwSj5BpfQjpSJPdqWalja4cTps29Y/PJVG/P7FYlPDkH3hO+Tr0CvDgQ== + + core-js@~2.3.0: + version "2.3.0" +@@ -4246,9 +4246,9 @@ ejs@^2.5.7: + integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== + + electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.202: +- version "1.4.233" +- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.233.tgz#aa142e45468bda111b88abc9cc59d573b75d6a60" +- integrity sha512-ejwIKXTg1wqbmkcRJh9Ur3hFGHFDZDw1POzdsVrB2WZjgRuRMHIQQKNpe64N/qh3ZtH2otEoRoS+s6arAAuAAw== ++ version "1.4.246" ++ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.246.tgz#802132d1bbd3ff32ce82fcd6a6ed6ab59b4366dc" ++ integrity sha512-/wFCHUE+Hocqr/LlVGsuKLIw4P2lBWwFIDcNMDpJGzyIysQV4aycpoOitAs32FT94EHKnNqDR/CVZJFbXEufJA== + + elegant-spinner@^1.0.1: + version "1.0.1" +@@ -4370,15 +4370,15 @@ error-stack-parser@^2.0.0: + stackframe "^1.3.4" + + es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5, es-abstract@^1.20.1: +- version "1.20.1" +- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814" +- integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA== ++ version "1.20.2" ++ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.2.tgz#8495a07bc56d342a3b8ea3ab01bd986700c2ccb3" ++ integrity sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ== + dependencies: + call-bind "^1.0.2" + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + function.prototype.name "^1.1.5" +- get-intrinsic "^1.1.1" ++ get-intrinsic "^1.1.2" + get-symbol-description "^1.0.0" + has "^1.0.3" + has-property-descriptors "^1.0.0" +@@ -4390,9 +4390,9 @@ es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19 + is-shared-array-buffer "^1.0.2" + is-string "^1.0.7" + is-weakref "^1.0.2" +- object-inspect "^1.12.0" ++ object-inspect "^1.12.2" + object-keys "^1.1.1" +- object.assign "^4.1.2" ++ object.assign "^4.1.4" + regexp.prototype.flags "^1.4.3" + string.prototype.trimend "^1.0.5" + string.prototype.trimstart "^1.0.5" +@@ -4625,9 +4625,11 @@ etag@~1.8.1: + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== + +-"eve@git://github.com/adobe-webplatform/eve.git#eef80ed": +- version "0.4.1" +- resolved "git://github.com/adobe-webplatform/eve.git#eef80ed8d188423c2272746fb8ae5cc8dad84cb1" ++"eve@https://github.com/adobe-webplatform/eve.git#eef80ed": ++ version "0.5.4" ++ uid "30c41dfb9de9679ea4fba10f192cc08cf7142b02" ++ resolved "https://github.com/adobe-webplatform/eve.git#30c41dfb9de9679ea4fba10f192cc08cf7142b02" ++ integrity "sha1-ULbfajKDzmjNlOopPrSv92fzUmg=" + + eventemitter3@^4.0.0: + version "4.0.7" +@@ -4792,11 +4794,11 @@ express@^4.16.2, express@^4.17.1: + vary "~1.1.2" + + ext@^1.1.2: +- version "1.6.0" +- resolved "https://registry.yarnpkg.com/ext/-/ext-1.6.0.tgz#3871d50641e874cc172e2b53f919842d19db4c52" +- integrity sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg== ++ version "1.7.0" ++ resolved "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f" ++ integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw== + dependencies: +- type "^2.5.0" ++ type "^2.7.2" + + extend-shallow@^2.0.1: + version "2.0.1" +@@ -5305,7 +5307,7 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: ++get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598" + integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA== +@@ -6970,7 +6972,7 @@ jquery@^3.3.1: + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16" + integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw== + +-js-base64@^2.1.9, js-base64@^2.4.3: ++js-base64@^2.1.9, js-base64@^2.4.9: + version "2.6.4" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4" + integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ== +@@ -8166,9 +8168,9 @@ node-releases@^2.0.6: + integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== + + node-sass@^7.0.1: +- version "7.0.1" +- resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-7.0.1.tgz#ad4f6bc663de8acc0a9360db39165a1e2620aa72" +- integrity sha512-uMy+Xt29NlqKCFdFRZyXKOTqGt+QaKHexv9STj2WeLottnlqZEEWx6Bj0MXNthmFRRdM/YwyNo/8Tr46TOM0jQ== ++ version "7.0.3" ++ resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-7.0.3.tgz#7620bcd5559c2bf125c4fbb9087ba75cd2df2ab2" ++ integrity sha512-8MIlsY/4dXUkJDYht9pIWBhMil3uHmE8b/AdJPjmFn1nBx9X9BASzfzmsCy0uCCb8eqI3SYYzVPDswWqSx7gjw== + dependencies: + async-foreach "^0.1.3" + chalk "^4.1.2" +@@ -8182,7 +8184,7 @@ node-sass@^7.0.1: + node-gyp "^8.4.1" + npmlog "^5.0.0" + request "^2.88.0" +- sass-graph "4.0.0" ++ sass-graph "^4.0.1" + stdout-stream "^1.4.0" + "true-case-path" "^1.0.2" + +@@ -8350,9 +8352,9 @@ numeral@^2.0.6: + integrity sha512-qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA== + + nwsapi@^2.2.0: +- version "2.2.1" +- resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.1.tgz#10a9f268fbf4c461249ebcfe38e359aa36e2577c" +- integrity sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg== ++ version "2.2.2" ++ resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0" ++ integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw== + + oauth-sign@~0.9.0: + version "0.9.0" +@@ -8378,7 +8380,7 @@ object-hash@^1.1.4: + resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df" + integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA== + +-object-inspect@^1.12.0, object-inspect@^1.9.0: ++object-inspect@^1.12.2, object-inspect@^1.9.0: + version "1.12.2" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" + integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== +@@ -8403,7 +8405,7 @@ object-visit@^1.0.0: + dependencies: + isobject "^3.0.0" + +-object.assign@^4.1.0, object.assign@^4.1.2: ++object.assign@^4.1.0, object.assign@^4.1.4: + version "4.1.4" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" + integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== +@@ -8528,10 +8530,10 @@ ora@3.0.0: + strip-ansi "^4.0.0" + wcwidth "^1.0.1" + +-orderedmap@^1.1.0: +- version "1.1.8" +- resolved "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.1.8.tgz#9652b2584f721c1032fa04cb60d442b3d4aa097c" +- integrity sha512-eWEYOAggZZpZbJ9CTsqAKOTxlbBHdHZ8pzcfEvNTxGrjQ/m+Q25nSWUiMlT9MTbgpB6FOiBDKqsgJ2FlLDVNaw== ++orderedmap@^2.0.0: ++ version "2.0.0" ++ resolved "https://registry.yarnpkg.com/orderedmap/-/orderedmap-2.0.0.tgz#12ff5ef6ea9d12d6430b80c701b35475e1c9ff34" ++ integrity sha512-buf4PoAMlh45b8a8gsGy/X6w279TSqkyAS0C0wdTSJwFSU+ljQFJON5I8NfjLHoCXwpSROIo2wr0g33T+kQshQ== + + os-browserify@^0.3.0: + version "0.3.0" +@@ -9431,9 +9433,9 @@ prosemirror-collab@^1.2.2: + prosemirror-state "^1.0.0" + + prosemirror-commands@^1.1.4: +- version "1.3.0" +- resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.3.0.tgz#361b2e2b2a347ce7453386459f97c3f549a1113b" +- integrity sha512-BwBbZ5OAScPcm0x7H8SPbqjuEJnCU2RJT9LDyOiiIl/3NbL1nJZI4SFNHwU2e/tRr2Xe7JsptpzseqvZvToLBQ== ++ version "1.3.1" ++ resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.3.1.tgz#926c88801eebaa50363d4658850b41406d375a31" ++ integrity sha512-XTporPgoECkOQACVw0JTe3RZGi+fls3/byqt+tXwGTkD7qLuB4KdVrJamDMJf4kfKga3uB8hZ+kUUyZ5oWpnfg== + dependencies: + prosemirror-model "^1.0.0" + prosemirror-state "^1.0.0" +@@ -9483,12 +9485,12 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.1.4: + prosemirror-state "^1.0.0" + w3c-keyname "^2.2.0" + +-prosemirror-model@1.9.1, prosemirror-model@^1.0.0, prosemirror-model@^1.13.1, prosemirror-model@^1.16.0, prosemirror-model@^1.8.1: +- version "1.9.1" +- resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.9.1.tgz#8c08cf556f593c5f015548d2c1a6825661df087f" +- integrity sha512-Qblh8pm1c7Ll64sYLauwwzjimo/tFg1zW3Q3IWhKRhvfOEgRKqa6dC5pRrAa+XHOIjBFEYrqbi52J5bqA2dV8Q== ++prosemirror-model@^1.0.0, prosemirror-model@^1.13.1, prosemirror-model@^1.16.0, prosemirror-model@^1.8.1: ++ version "1.18.1" ++ resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.18.1.tgz#1d5d6b6de7b983ee67a479dc607165fdef3935bd" ++ integrity sha512-IxSVBKAEMjD7s3n8cgtwMlxAXZrC7Mlag7zYsAKDndAqnDScvSmp/UdnRTV/B33lTCVU3CCm7dyAn/rVVD0mcw== + dependencies: +- orderedmap "^1.1.0" ++ orderedmap "^2.0.0" + + prosemirror-schema-list@^1.1.4: + version "1.2.1" +@@ -9526,9 +9528,9 @@ prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transfor + prosemirror-model "^1.0.0" + + prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.16.5: +- version "1.27.2" +- resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.27.2.tgz#7f1e9b73698ba2622c515e2a617fd49232d214c4" +- integrity sha512-RE2GLUaYXUyrpUl58vHoznZ3wKAj7z8f1ZZolivljwwOe1yiSzsEsuJPZmm3mpBXRgHGk7LWh5v+uhdDXAbjkA== ++ version "1.28.0" ++ resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.28.0.tgz#d7ebdda7cf44b2b2c0b795a7546aef0f71b50c76" ++ integrity sha512-cmFK9osE7WAQptye6o/I5LjURZkSF4z3H7+LZmQtpJDZ9x4X/Z9v85oOeDvfRiX/J2rsaRYbEkWWbu3l9eBsdQ== + dependencies: + prosemirror-model "^1.16.0" + prosemirror-state "^1.0.0" +@@ -9682,8 +9684,9 @@ range-parser@^1.2.1, range-parser@~1.2.0, range-parser@~1.2.1: + "raphael@https://github.com/nhn/raphael.git#2.2.0-c": + version "2.2.0-c" + resolved "https://github.com/nhn/raphael.git#78a6ed3ec269f33b6457b0ec66f8c3d1f2ed70e0" ++ integrity sha1-hD0Or0EKSD9laRjRbUEJL2QkwIU= + dependencies: +- eve "git://github.com/adobe-webplatform/eve.git#eef80ed" ++ eve "eve@https://github.com/adobe-webplatform/eve.git#eef80ed" + + raw-body@2.5.1: + version "2.5.1" +@@ -10173,14 +10176,14 @@ sane@^4.0.3: + minimist "^1.1.1" + walker "~1.0.5" + +-sass-graph@4.0.0: +- version "4.0.0" +- resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-4.0.0.tgz#fff8359efc77b31213056dfd251d05dadc74c613" +- integrity sha512-WSO/MfXqKH7/TS8RdkCX3lVkPFQzCgbqdGsmSKq6tlPU+GpGEsa/5aW18JqItnqh+lPtcjifqdZ/VmiILkKckQ== ++sass-graph@^4.0.1: ++ version "4.0.1" ++ resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-4.0.1.tgz#2ff8ca477224d694055bf4093f414cf6cfad1d2e" ++ integrity sha512-5YCfmGBmxoIRYHnKK2AKzrAkCoQ8ozO+iumT8K4tXJXRVCPf+7s1/9KxTSW3Rbvf+7Y7b4FR3mWyLnQr3PHocA== + dependencies: + glob "^7.0.0" + lodash "^4.17.11" +- scss-tokenizer "^0.3.0" ++ scss-tokenizer "^0.4.3" + yargs "^17.2.1" + + sass-loader@7.0.3: +@@ -10251,13 +10254,13 @@ script-loader@0.7.2: + dependencies: + raw-loader "~0.5.1" + +-scss-tokenizer@^0.3.0: +- version "0.3.0" +- resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.3.0.tgz#ef7edc3bc438b25cd6ffacf1aa5b9ad5813bf260" +- integrity sha512-14Zl9GcbBvOT9057ZKjpz5yPOyUWG2ojd9D5io28wHRYsOrs7U95Q+KNL87+32p8rc+LvDpbu/i9ZYjM9Q+FsQ== ++scss-tokenizer@^0.4.3: ++ version "0.4.3" ++ resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.4.3.tgz#1058400ee7d814d71049c29923d2b25e61dc026c" ++ integrity sha512-raKLgf1LI5QMQnG+RxHz6oK0sL3x3I4FN2UDLqgLOGO8hodECNnNh5BXn7fAyBxrA8zVzdQizQ6XjNJQ+uBwMw== + dependencies: +- js-base64 "^2.4.3" +- source-map "^0.7.1" ++ js-base64 "^2.4.9" ++ source-map "^0.7.3" + + select-hose@^2.0.0: + version "2.0.0" +@@ -10291,11 +10294,6 @@ semver@5.5.0: + resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" + integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== + +-semver@7.0.0: +- version "7.0.0" +- resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" +- integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== +- + semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" +@@ -10663,7 +10661,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +-source-map@^0.7.1, source-map@^0.7.3: ++source-map@^0.7.3: + version "0.7.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" + integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== +@@ -11077,9 +11075,9 @@ supports-color@^7.0.0, supports-color@^7.1.0: + has-flag "^4.0.0" + + supports-hyperlinks@^2.0.0: +- version "2.2.0" +- resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" +- integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== ++ version "2.3.0" ++ resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624" ++ integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA== + dependencies: + has-flag "^4.0.0" + supports-color "^7.0.0" +@@ -11608,7 +11606,7 @@ type@^1.0.1: + resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0" + integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== + +-type@^2.5.0: ++type@^2.7.2: + version "2.7.2" + resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0" + integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw== +@@ -11761,9 +11759,9 @@ upath@^1.1.1: + integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== + + update-browserslist-db@^1.0.5: +- version "1.0.5" +- resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz#be06a5eedd62f107b7c19eb5bcefb194411abf38" +- integrity sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q== ++ version "1.0.7" ++ resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz#16279639cff1d0f800b14792de43d97df2d11b7d" ++ integrity sha512-iN/XYesmZ2RmmWAiI4Z5rq0YqSiv0brj9Ce9CfhNE4xIW2h+MFxcgkxIzZ+ShkFPUkjU3gQ+3oypadD3RAMtrg== + dependencies: + escalade "^3.1.1" + picocolors "^1.0.0" +@@ -11971,9 +11969,9 @@ vue-loader@15.3.0: + vue-style-loader "^4.1.0" + + vue-router@^3.5.1: +- version "3.6.4" +- resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.6.4.tgz#46b77eca93cd69f6840c4730b13976a130144ecc" +- integrity sha512-QSJs5aKKPiwBH++gelVbnq0ZFbUZXjlsjAklUM+F8dtd49YY72QsD1uGpBk/cqLK1bkZ8HiqPjS8NkhaGtpqHw== ++ version "3.6.5" ++ resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.6.5.tgz#95847d52b9a7e3f1361cb605c8e6441f202afad8" ++ integrity sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ== + + vue-splitpane@1.0.2: + version "1.0.2" diff --git a/akkoma/default.nix b/akkoma/default.nix index 1c1d89b..5d01d2f 100644 --- a/akkoma/default.nix +++ b/akkoma/default.nix @@ -2,7 +2,7 @@ pkgs, inputs, }: -with pkgs; {akkoma = beamPackages.mixRelease rec { +with pkgs; rec {akkoma = beamPackages.mixRelease rec { pname = "akkoma"; version = inputs.akkoma.lastModifiedDate; @@ -168,4 +168,28 @@ with pkgs; {akkoma = beamPackages.mixRelease rec { }; }; }; -};} +}; +akkoma-fe = mkYarnPackage rec { + pname = "akkoma-fe"; + version = inputs.akkoma-fe.lastModifiedDate; + src = inputs.akkoma-fe; + patchPhase = '' + sed -i 's/let commitHash = .*/let commitHash = "${inputs.akkoma-fe.rev}"/' build/webpack.prod.conf.js + sed -i 's/.*git rev-parse.*//' build/webpack.prod.conf.js + ''; + buildPhase = "yarn build --offline"; +}; +akkoma-admin-src = applyPatches { + name = "akkoma-admin-fe-src-${inputs.akkoma-admin-fe.lastModifiedDate}"; + src = inputs.akkoma-admin-fe; + patches = [ + ./akkoma.patch + ]; +}; +akkoma-admin-fe = mkYarnPackage rec { + pname = "akkoma-admin-fe"; + version = inputs.akkoma-admin-fe.lastModifiedDate; + src = akkoma-admin-src; + buildPhase = "yarn build:prod --offline"; +}; +} diff --git a/flake.lock b/flake.lock index 529bc16..b44356c 100644 --- a/flake.lock +++ b/flake.lock @@ -16,6 +16,38 @@ "url": "https://akkoma.dev/AkkomaGang/akkoma" } }, + "akkoma-admin-fe": { + "flake": false, + "locked": { + "lastModified": 1661801796, + "narHash": "sha256-dqkW8p4x+5z1Hd8gp8V4+DsLm8EspVwPXDxtvlp1AIk=", + "ref": "refs/heads/develop", + "rev": "6b131e0779b16f8f3c1021b2a0e72b4e7a271c4c", + "revCount": 1961, + "type": "git", + "url": "https://akkoma.dev/AkkomaGang/admin-fe" + }, + "original": { + "type": "git", + "url": "https://akkoma.dev/AkkomaGang/admin-fe" + } + }, + "akkoma-fe": { + "flake": false, + "locked": { + "lastModified": 1662632260, + "narHash": "sha256-JykZWh+BQrVZPlaKe9bNHh5h5ieUddS/HYLfYyjPTbw=", + "ref": "refs/heads/develop", + "rev": "da4b315d69843ecf463b7236d90755afc43b0b52", + "revCount": 6732, + "type": "git", + "url": "https://akkoma.dev/AkkomaGang/pleroma-fe" + }, + "original": { + "type": "git", + "url": "https://akkoma.dev/AkkomaGang/pleroma-fe" + } + }, "cargo2nix": { "inputs": { "flake-compat": "flake-compat", @@ -485,6 +517,8 @@ "root": { "inputs": { "akkoma": "akkoma", + "akkoma-admin-fe": "akkoma-admin-fe", + "akkoma-fe": "akkoma-fe", "cargo2nix": "cargo2nix", "clean-s3-cache": "clean-s3-cache", "drone-runner-docker": "drone-runner-docker", diff --git a/flake.nix b/flake.nix index 33d7208..b6a3eb2 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,10 @@ miifox-net.flake = false; akkoma.url = "git+https://akkoma.dev/AkkomaGang/akkoma"; akkoma.flake = false; + akkoma-fe.url = "git+https://akkoma.dev/AkkomaGang/pleroma-fe"; + akkoma-fe.flake = false; + akkoma-admin-fe.url = "git+https://akkoma.dev/AkkomaGang/admin-fe"; + akkoma-admin-fe.flake = false; matrix-media-repo.url = "github:turt2live/matrix-media-repo"; matrix-media-repo.flake = false; mautrix-whatsapp.url = "github:mautrix/whatsapp";