lemmy: 0.12.2 -> 0.13.3

lemmy: update update.sh to include package.json

lemmy: use commited package.json

4 files changed, 126 insertions, 5 deletions

diff --git a/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json
new file mode 100644
index 00000000000..8da47bfd5a1
--- /dev/null
+++ b/pkgs/servers/web-apps/lemmy/package.json
@@ -0,0 +1,115 @@
+{
+  "name": "lemmy-ui",
+  "description": "An isomorphic UI for lemmy",
+  "version": "0.13.3",
+  "author": "Dessalines <tyhou13@gmx.com>",
+  "license": "AGPL-3.0",
+  "scripts": {
+    "build:dev": "webpack --mode=development",
+    "build:prod": "webpack --mode=production",
+    "clean": "yarn run rimraf dist",
+    "dev": "yarn start",
+    "lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src",
+    "prebuild:dev": "yarn clean && node generate_translations.js",
+    "prebuild:prod": "yarn clean && node generate_translations.js",
+    "start": "yarn build:dev --watch"
+  },
+  "repository": "https://github.com/LemmyNet/lemmy-ui",
+  "dependencies": {
+    "@typescript-eslint/parser": "^4.32.0",
+    "autosize": "^5.0.1",
+    "check-password-strength": "^2.0.3",
+    "choices.js": "^9.0.1",
+    "emoji-short-name": "^1.0.0",
+    "express": "~4.17.1",
+    "i18next": "^21.1.1",
+    "inferno": "^7.4.10",
+    "inferno-create-element": "^7.4.10",
+    "inferno-helmet": "^5.2.1",
+    "inferno-hydrate": "^7.4.10",
+    "inferno-i18next-dess": "^0.0.1",
+    "inferno-router": "^7.4.10",
+    "inferno-server": "^7.4.10",
+    "isomorphic-cookie": "^1.2.4",
+    "jwt-decode": "^3.1.2",
+    "markdown-it": "^12.1.0",
+    "markdown-it-container": "^3.0.0",
+    "markdown-it-html5-embed": "^1.0.0",
+    "markdown-it-sub": "^1.0.0",
+    "markdown-it-sup": "^1.0.0",
+    "moment": "^2.29.1",
+    "reconnecting-websocket": "^4.4.0",
+    "register-service-worker": "^1.7.2",
+    "rxjs": "^7.2.0",
+    "serialize-javascript": "^6.0.0",
+    "tippy.js": "^6.3.1",
+    "toastify-js": "^1.11.1",
+    "tributejs": "^5.1.3",
+    "ws": "^8.2.2"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.15.5",
+    "@babel/plugin-transform-runtime": "^7.14.5",
+    "@babel/plugin-transform-typescript": "^7.15.4",
+    "@babel/preset-env": "7.15.6",
+    "@babel/preset-typescript": "^7.14.5",
+    "@babel/runtime": "^7.15.4",
+    "@types/autosize": "^4.0.0",
+    "@types/express": "^4.17.13",
+    "@types/node": "^16.10.1",
+    "@types/node-fetch": "^2.5.11",
+    "@types/serialize-javascript": "^5.0.1",
+    "@typescript-eslint/eslint-plugin": "^4.32.0",
+    "babel-loader": "^8.2.2",
+    "babel-plugin-inferno": "^6.3.0",
+    "bootstrap": "^5.1.1",
+    "bootswatch": "^5.1.1",
+    "clean-webpack-plugin": "^4.0.0",
+    "copy-webpack-plugin": "^9.0.1",
+    "css-loader": "^6.3.0",
+    "eslint": "^7.30.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "husky": "^7.0.2",
+    "import-sort-style-module": "^6.0.0",
+    "iso-639-1": "^2.1.9",
+    "lemmy-js-client": "0.13.0",
+    "lint-staged": "^11.0.1",
+    "mini-css-extract-plugin": "^2.3.0",
+    "node-fetch": "^2.6.1",
+    "node-sass": "^6.0.1",
+    "prettier": "^2.4.1",
+    "prettier-plugin-import-sort": "^0.0.7",
+    "prettier-plugin-organize-imports": "^2.3.4",
+    "prettier-plugin-packagejson": "^2.2.13",
+    "rimraf": "^3.0.2",
+    "run-node-webpack-plugin": "^1.3.0",
+    "sass-loader": "^12.1.0",
+    "sortpack": "^2.2.0",
+    "style-loader": "^3.3.0",
+    "terser": "^5.9.0",
+    "typescript": "^4.4.3",
+    "webpack": "5.54.0",
+    "webpack-cli": "^4.7.2",
+    "webpack-dev-server": "4.3.0",
+    "webpack-node-externals": "^3.0.0"
+  },
+  "engines": {
+    "node": ">=8.9.0"
+  },
+  "engineStrict": true,
+  "lint-staged": {
+    "*.{ts,tsx,js}": [
+      "prettier --write",
+      "eslint --fix"
+    ],
+    "package.json": [
+      "sortpack"
+    ]
+  },
+  "importSort": {
+    ".js, .jsx, .ts, .tsx": {
+      "style": "module",
+      "parser": "typescript"
+    }
+  }
+}
diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json
index 77c99e43bfa..4fca9035e28 100644
--- a/pkgs/servers/web-apps/lemmy/pin.json
+++ b/pkgs/servers/web-apps/lemmy/pin.json
@@ -1,7 +1,7 @@
 {
-  "version": "0.12.2",
-  "serverSha256": "sha256-jhUpQ2f+b0BEXVfQOIujxam2PQA44wluUraJVJxL6LU=",
-  "serverCargoSha256": "sha256-2i8zCwd33LtUKxOChx/SLP9sWMRmxGkKK8xzaJImMHM=",
-  "uiSha256": "sha256-iFLJqUnz4m9/JTSaJSUugzY5KkiKtH0sMYY4ALm2Ebk=",
-  "uiYarnDepsSha256": "sha256-i12J+Qi7Nsjr5JipeRXdkFkh+I/ROsgRw4Vty2cMNyU="
+  "version": "0.13.3",
+  "serverSha256": "sha256-Ht+gcNv8gQAQtEuAJ/QH4nNvo+PZogNB09f4eRlvIYg=",
+  "serverCargoSha256": "sha256-j/l/muCQefvuuWsi+Iahr1M4V6AUzmxm3pr7cJxw7Ww=",
+  "uiSha256": "sha256-uHb+V3zadiHlExpmAdRLoV3F/0mrYrko6RTDJcw9YO4=",
+  "uiYarnDepsSha256": "sha256-53sa6uL1+SvhtUtKdS36rBcJVgVXhnNdITWPyauLrx4="
 }
diff --git a/pkgs/servers/web-apps/lemmy/ui.nix b/pkgs/servers/web-apps/lemmy/ui.nix
index cbe4f49fe28..f140cf071ea 100644
--- a/pkgs/servers/web-apps/lemmy/ui.nix
+++ b/pkgs/servers/web-apps/lemmy/ui.nix
@@ -39,6 +39,7 @@ mkYarnPackage {
 
   extraBuildInputs = [ libsass ];
 
+  packageJSON = ./package.json;
   offlineCache = fetchYarnDeps {
     yarnLock = src + "/yarn.lock";
     sha256 = pinData.uiYarnDepsSha256;
diff --git a/pkgs/servers/web-apps/lemmy/update.sh b/pkgs/servers/web-apps/lemmy/update.sh
index 465b684ad38..846804a97e7 100755
--- a/pkgs/servers/web-apps/lemmy/update.sh
+++ b/pkgs/servers/web-apps/lemmy/update.sh
@@ -16,6 +16,11 @@ if ($latest_version === $current_version) {
   echo "lemmy is already up-to-date"
   return 0
 } else {
+  # for some strange reason, hydra fails on reading upstream package.json directly
+  var source = "https://raw.githubusercontent.com/$owner/$ui_repo/$latest_version"
+  var package_json = "$(curl -qf $source/package.json)"
+  echo $package_json > $directory/package.json
+
   var server_tarball_meta = $(nix-prefetch-github $owner $server_repo --rev "$latest_rev")
   var server_tarball_hash = "sha256-$(echo $server_tarball_meta | jq -r '.sha256')"
   var ui_tarball_meta = $(nix-prefetch-github $owner $ui_repo --rev "$latest_rev")