git.iko.soy/typeable/nixpkgs
on master help sign in
Update lemmy webapp (#147204)

* lemmy: change update script to be more idiomatic Co-authored-by: Raphael Megzari <raphael@megzari.com> * lemmy: 0.13.3 -> 0.14.0 Co-authored-by: Raphael Megzari <raphael@megzari.com> Co-authored-by: Raphael Megzari <raphael@megzari.com>

commit7a4744b16476c13ef54b5a792fcd4897370ca490 authorBill Ewanick <bill@ewanick.com> dateTue 23 Nov 2021, 20:48 (5 years ago) parent253aba7
3 files changed+61−59
compare with master
unifiedsplit
pkgs/servers/web-apps/lemmy/package.json+40−39 pkgs/servers/web-apps/lemmy/pin.json+5−5 pkgs/servers/web-apps/lemmy/update.sh+16−15
pkgs/servers/web-apps/lemmy/package.json+40−39
@@ -1,7 +1,7 @@
11{
22 "name": "lemmy-ui",
33 "description": "An isomorphic UI for lemmy",
4− "version": "0.13.3",
4+ "version": "0.14.0",
55 "author": "Dessalines <tyhou13@gmx.com>",
66 "license": "AGPL-3.0",
77 "scripts": {
@@ -12,24 +12,25 @@
1212 "lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src",
1313 "prebuild:dev": "yarn clean && node generate_translations.js",
1414 "prebuild:prod": "yarn clean && node generate_translations.js",
15+ "prepare": "husky install",
1516 "start": "yarn build:dev --watch"
1617 },
1718 "repository": "https://github.com/LemmyNet/lemmy-ui",
1819 "dependencies": {
19− "@typescript-eslint/parser": "^4.32.0",
20+ "@typescript-eslint/parser": "^5.4.0",
2021 "autosize": "^5.0.1",
2122 "check-password-strength": "^2.0.3",
2223 "choices.js": "^9.0.1",
2324 "emoji-short-name": "^1.0.0",
2425 "express": "~4.17.1",
25− "i18next": "^21.1.1",
26− "inferno": "^7.4.10",
27− "inferno-create-element": "^7.4.10",
26+ "i18next": "^21.5.0",
27+ "inferno": "^7.4.11",
28+ "inferno-create-element": "^7.4.11",
2829 "inferno-helmet": "^5.2.1",
29− "inferno-hydrate": "^7.4.10",
30+ "inferno-hydrate": "^7.4.11",
3031 "inferno-i18next-dess": "^0.0.1",
31− "inferno-router": "^7.4.10",
32− "inferno-server": "^7.4.10",
32+ "inferno-router": "^7.4.11",
33+ "inferno-server": "^7.4.11",
3334 "isomorphic-cookie": "^1.2.4",
3435 "jwt-decode": "^3.1.2",
3536 "markdown-it": "^12.1.0",
@@ -40,57 +41,57 @@
4041 "moment": "^2.29.1",
4142 "reconnecting-websocket": "^4.4.0",
4243 "register-service-worker": "^1.7.2",
43− "rxjs": "^7.2.0",
44+ "rxjs": "^7.4.0",
4445 "serialize-javascript": "^6.0.0",
45− "tippy.js": "^6.3.1",
46− "toastify-js": "^1.11.1",
46+ "tippy.js": "^6.3.7",
47+ "toastify-js": "^1.11.2",
4748 "tributejs": "^5.1.3",
48− "ws": "^8.2.2"
49+ "ws": "^8.2.3"
4950 },
5051 "devDependencies": {
51− "@babel/core": "^7.15.5",
52− "@babel/plugin-transform-runtime": "^7.14.5",
53− "@babel/plugin-transform-typescript": "^7.15.4",
54− "@babel/preset-env": "7.15.6",
55− "@babel/preset-typescript": "^7.14.5",
56− "@babel/runtime": "^7.15.4",
52+ "@babel/core": "^7.16.0",
53+ "@babel/plugin-transform-runtime": "^7.16.0",
54+ "@babel/plugin-transform-typescript": "^7.16.1",
55+ "@babel/preset-env": "7.16.0",
56+ "@babel/preset-typescript": "^7.16.0",
57+ "@babel/runtime": "^7.16.3",
5758 "@types/autosize": "^4.0.0",
5859 "@types/express": "^4.17.13",
59− "@types/node": "^16.10.1",
60+ "@types/node": "^16.11.7",
6061 "@types/node-fetch": "^2.5.11",
6162 "@types/serialize-javascript": "^5.0.1",
62− "@typescript-eslint/eslint-plugin": "^4.32.0",
63− "babel-loader": "^8.2.2",
63+ "@typescript-eslint/eslint-plugin": "^5.4.0",
64+ "babel-loader": "^8.2.3",
6465 "babel-plugin-inferno": "^6.3.0",
65− "bootstrap": "^5.1.1",
66− "bootswatch": "^5.1.1",
66+ "bootstrap": "^5.1.3",
67+ "bootswatch": "^5.1.3",
6768 "clean-webpack-plugin": "^4.0.0",
68− "copy-webpack-plugin": "^9.0.1",
69− "css-loader": "^6.3.0",
70− "eslint": "^7.30.0",
69+ "copy-webpack-plugin": "^9.1.0",
70+ "css-loader": "^6.5.1",
71+ "eslint": "^8.2.0",
7172 "eslint-plugin-prettier": "^4.0.0",
72− "husky": "^7.0.2",
73+ "husky": "^7.0.4",
7374 "import-sort-style-module": "^6.0.0",
74− "iso-639-1": "^2.1.9",
75− "lemmy-js-client": "0.13.0",
76− "lint-staged": "^11.0.1",
77− "mini-css-extract-plugin": "^2.3.0",
75+ "iso-639-1": "^2.1.10",
76+ "lemmy-js-client": "0.14.0-rc.1",
77+ "lint-staged": "^11.2.6",
78+ "mini-css-extract-plugin": "^2.4.4",
7879 "node-fetch": "^2.6.1",
7980 "node-sass": "^6.0.1",
8081 "prettier": "^2.4.1",
8182 "prettier-plugin-import-sort": "^0.0.7",
8283 "prettier-plugin-organize-imports": "^2.3.4",
83− "prettier-plugin-packagejson": "^2.2.13",
84+ "prettier-plugin-packagejson": "^2.2.15",
8485 "rimraf": "^3.0.2",
8586 "run-node-webpack-plugin": "^1.3.0",
86− "sass-loader": "^12.1.0",
87+ "sass-loader": "^12.3.0",
8788 "sortpack": "^2.2.0",
88− "style-loader": "^3.3.0",
89− "terser": "^5.9.0",
90− "typescript": "^4.4.3",
91− "webpack": "5.54.0",
92− "webpack-cli": "^4.7.2",
93− "webpack-dev-server": "4.3.0",
89+ "style-loader": "^3.3.1",
90+ "terser": "^5.10.0",
91+ "typescript": "^4.4.4",
92+ "webpack": "5.64.1",
93+ "webpack-cli": "^4.9.1",
94+ "webpack-dev-server": "4.5.0",
9495 "webpack-node-externals": "^3.0.0"
9596 },
9697 "engines": {
pkgs/servers/web-apps/lemmy/pin.json+5−5
@@ -1,7 +1,7 @@
11{
2− "version": "0.13.3",
3− "serverSha256": "sha256-Ht+gcNv8gQAQtEuAJ/QH4nNvo+PZogNB09f4eRlvIYg=",
4− "serverCargoSha256": "sha256-j/l/muCQefvuuWsi+Iahr1M4V6AUzmxm3pr7cJxw7Ww=",
5− "uiSha256": "sha256-uHb+V3zadiHlExpmAdRLoV3F/0mrYrko6RTDJcw9YO4=",
6− "uiYarnDepsSha256": "sha256-53sa6uL1+SvhtUtKdS36rBcJVgVXhnNdITWPyauLrx4="
2+ "version": "0.14.0",
3+ "serverSha256": "sha256-rrLOWoy4GkVtfIPpyR0Zwvnqq39CoZRDaVPNSpeJpkA=",
4+ "serverCargoSha256": "sha256-6HrsMwzcmNw8udsCdvn8zgIWN0N3Vvsn9bFk+5tBOds=",
5+ "uiSha256": "sha256-e+ajyUc2P5eK1dH7qQsC9BmZgT3NCGLbbzbUE3i2rXY=",
6+ "uiYarnDepsSha256": "sha256-g3jCc98ftFyvZGD2bESY1eIsLZyQxZpDxgHdRGu78vs="
77}
pkgs/servers/web-apps/lemmy/update.sh+16−15
@@ -4,27 +4,27 @@
44# TODO set to `verbose` or `extdebug` once implemented in oil
55shopt --set xtrace
66
7−var directory = $(dirname $0 | xargs realpath)
8−var owner = "LemmyNet"
9−var ui_repo = "lemmy-ui"
10−var server_repo = "lemmy"
11−var latest_rev = $(curl -q https://api.github.com/repos/${owner}/${server_repo}/releases/latest | \
7+const directory = $(dirname $0 | xargs realpath)
8+const owner = "LemmyNet"
9+const ui_repo = "lemmy-ui"
10+const server_repo = "lemmy"
11+const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${server_repo}/releases/latest | \
1212 jq -r '.tag_name')
13−var latest_version = $(echo $latest_rev)
14−var current_version = $(jq -r '.version' $directory/pin.json)
13+const latest_version = $(echo $latest_rev)
14+const current_version = $(jq -r '.version' $directory/pin.json)
1515if ($latest_version === $current_version) {
1616 echo "lemmy is already up-to-date"
1717 return 0
1818} else {
1919 # for some strange reason, hydra fails on reading upstream package.json directly
20− var source = "https://raw.githubusercontent.com/$owner/$ui_repo/$latest_version"
21− var package_json = "$(curl -qf $source/package.json)"
20+ const source = "https://raw.githubusercontent.com/$owner/$ui_repo/$latest_version"
21+ const package_json = $(curl -qf $source/package.json)
2222 echo $package_json > $directory/package.json
2323
24− var server_tarball_meta = $(nix-prefetch-github $owner $server_repo --rev "$latest_rev")
25− var server_tarball_hash = "sha256-$(echo $server_tarball_meta | jq -r '.sha256')"
26− var ui_tarball_meta = $(nix-prefetch-github $owner $ui_repo --rev "$latest_rev")
27− var ui_tarball_hash = "sha256-$(echo $ui_tarball_meta | jq -r '.sha256')"
24+ const server_tarball_meta = $(nix-prefetch-github $owner $server_repo --rev $latest_rev)
25+ const server_tarball_hash = "sha256-$(echo $server_tarball_meta | jq -r '.sha256')"
26+ const ui_tarball_meta = $(nix-prefetch-github $owner $ui_repo --rev $latest_rev)
27+ const ui_tarball_hash = "sha256-$(echo $ui_tarball_meta | jq -r '.sha256')"
2828
2929 jq ".version = \"$latest_version\" | \
3030 .\"serverSha256\" = \"$server_tarball_hash\" | \
@@ -32,12 +32,12 @@ if ($latest_version === $current_version) {
3232 .\"serverCargoSha256\" = \"\" | \
3333 .\"uiYarnDepsSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json
3434
35− var new_cargo_sha256 = $(nix-build -A lemmy-server 2>&1 | \
35+ const new_cargo_sha256 = $(nix-build -A lemmy-server 2>&1 | \
3636 tail -n 2 | \
3737 head -n 1 | \
3838 sd '\s+got:\s+' '')
3939
40− var new_offline_cache_sha256 = $(nix-build -A lemmy-ui 2>&1 | \
40+ const new_offline_cache_sha256 = $(nix-build -A lemmy-ui 2>&1 | \
4141 tail -n 2 | \
4242 head -n 1 | \
4343 sd '\s+got:\s+' '')
@@ -46,3 +46,4 @@ if ($latest_version === $current_version) {
4646 .\"uiYarnDepsSha256\" = \"$new_offline_cache_sha256\"" \
4747 $directory/pin.json | sponge $directory/pin.json
4848}
49+