From 5fb0d258ea9db65345006fb33c2ea191c3014656 Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Sun, 26 Jun 2022 00:08:11 -0400 Subject: [PATCH] lemmy: 0.15.1 -> 0.16.4 --- pkgs/servers/web-apps/lemmy/package.json | 70 ++++++++++++------------ pkgs/servers/web-apps/lemmy/pin.json | 10 ++-- pkgs/servers/web-apps/lemmy/server.nix | 4 +- 3 files changed, 43 insertions(+), 41 deletions(-) diff --git a/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json index bb7dc863d5b..934cccd205f 100644 --- a/pkgs/servers/web-apps/lemmy/package.json +++ b/pkgs/servers/web-apps/lemmy/package.json @@ -1,7 +1,7 @@ { "name": "lemmy-ui", "description": "An isomorphic UI for lemmy", - "version": "0.15.1", + "version": "0.16.4", "author": "Dessalines ", "license": "AGPL-3.0", "scripts": { @@ -17,14 +17,14 @@ }, "repository": "https://github.com/LemmyNet/lemmy-ui", "dependencies": { - "@typescript-eslint/parser": "^5.6.0", + "@typescript-eslint/parser": "^5.21.0", "autosize": "^5.0.1", - "check-password-strength": "^2.0.3", - "choices.js": "^10.0.0", + "check-password-strength": "^2.0.5", + "choices.js": "^10.1.0", "classnames": "^2.3.1", - "emoji-short-name": "^1.0.0", - "express": "~4.17.1", - "i18next": "^21.5.4", + "emoji-short-name": "^2.0.0", + "express": "~4.18.0", + "i18next": "^21.6.16", "inferno": "^7.4.11", "inferno-create-element": "^7.4.11", "inferno-helmet": "^5.2.1", @@ -34,15 +34,16 @@ "inferno-server": "^7.4.11", "isomorphic-cookie": "^1.2.4", "jwt-decode": "^3.1.2", - "markdown-it": "^12.1.0", + "markdown-it": "^13.0.0", "markdown-it-container": "^3.0.0", + "markdown-it-footnote": "^3.0.3", "markdown-it-html5-embed": "^1.0.0", "markdown-it-sub": "^1.0.0", "markdown-it-sup": "^1.0.0", - "moment": "^2.29.1", + "moment": "^2.29.3", "register-service-worker": "^1.7.2", - "rxjs": "^7.4.0", - "sass": "^1.47.0", + "rxjs": "^7.5.5", + "sass": "^1.51.0", "serialize-javascript": "^6.0.0", "tippy.js": "^6.3.7", "toastify-js": "^1.11.2", @@ -50,48 +51,47 @@ "websocket-ts": "^1.1.1" }, "devDependencies": { - "@babel/core": "^7.16.0", - "@babel/plugin-transform-runtime": "^7.16.4", + "@babel/core": "^7.17.9", + "@babel/plugin-transform-runtime": "^7.17.0", "@babel/plugin-transform-typescript": "^7.16.1", - "@babel/preset-env": "7.16.8", + "@babel/preset-env": "7.16.11", "@babel/preset-typescript": "^7.16.0", - "@babel/runtime": "^7.16.3", + "@babel/runtime": "^7.17.9", "@types/autosize": "^4.0.0", "@types/express": "^4.17.13", - "@types/node": "^17.0.8", - "@types/node-fetch": "^2.5.11", + "@types/node": "^17.0.29", + "@types/node-fetch": "^2.6.1", "@types/serialize-javascript": "^5.0.1", - "@typescript-eslint/eslint-plugin": "^5.6.0", - "babel-loader": "^8.2.3", - "babel-plugin-inferno": "^6.3.0", + "@typescript-eslint/eslint-plugin": "^5.21.0", + "babel-loader": "^8.2.5", + "babel-plugin-inferno": "^6.4.0", "bootstrap": "^5.1.3", "bootswatch": "^5.1.3", "clean-webpack-plugin": "^4.0.0", - "copy-webpack-plugin": "^10.0.0", - "css-loader": "^6.5.1", - "eslint": "^8.4.0", + "copy-webpack-plugin": "^10.2.4", + "css-loader": "^6.7.1", + "eslint": "^8.14.0", "eslint-plugin-prettier": "^4.0.0", "husky": "^7.0.4", "import-sort-style-module": "^6.0.0", - "iso-639-1": "^2.1.10", - "lemmy-js-client": "0.15.0", - "lint-staged": "^12.1.2", - "mini-css-extract-plugin": "^2.4.5", + "lemmy-js-client": "0.16.4", + "lint-staged": "^12.4.1", + "mini-css-extract-plugin": "^2.6.0", "node-fetch": "^2.6.1", - "prettier": "^2.5.1", + "prettier": "^2.6.2", "prettier-plugin-import-sort": "^0.0.7", "prettier-plugin-organize-imports": "^2.3.4", - "prettier-plugin-packagejson": "^2.2.15", + "prettier-plugin-packagejson": "^2.2.17", "rimraf": "^3.0.2", "run-node-webpack-plugin": "^1.3.0", - "sass-loader": "^12.3.0", + "sass-loader": "^12.6.0", "sortpack": "^2.2.0", "style-loader": "^3.3.1", - "terser": "^5.10.0", - "typescript": "^4.5.2", - "webpack": "5.66.0", - "webpack-cli": "^4.9.1", - "webpack-dev-server": "4.7.3", + "terser": "^5.13.0", + "typescript": "^4.6.3", + "webpack": "5.72.0", + "webpack-cli": "^4.9.2", + "webpack-dev-server": "4.8.1", "webpack-node-externals": "^3.0.0" }, "engines": { diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index 9a588b54da9..c22c821f5db 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,7 +1,7 @@ { - "version": "0.15.1", - "serverSha256": "sha256-HHr9mG0AuI/86+EjODE/GT9lhl5DeNkzQ4k077b7ICU=", - "serverCargoSha256": "sha256-ErMNsyHfBiYZA4gjaxPHO+fQseUVIKy/928oGqw+Adg=", - "uiSha256": "sha256-Al6Q1xXkjqIb2v2S4JbmlQAAFCKwzkAW924uolC0tu8=", - "uiYarnDepsSha256": "sha256-Zadp74ZHmbxCHxpDAYOa6Ot2kWujIj8ZzrSaIEsYgMY=" + "version": "0.16.4", + "serverSha256": "sha256-xbxavlmRm7QTbrAjw6IMgQq8rEgyEHdcj11EhsOY+j0=", + "serverCargoSha256": "sha256-vDIaLpw0C6fnv0quH20qRN0I38Br338+MS9YzVfNizU=", + "uiSha256": "sha256-GZH/fSYLbxwigrr5LwAzxH4ElDVjTs8Tqqq+xYDFNCU", + "uiYarnDepsSha256": "sha256-BQs9UXUT/CcxJ7CdLksYGvGPGAaW7FLUAShLsbPC0jw=" } diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 5526d8fe31f..52dddc8183c 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -7,6 +7,7 @@ , libiconv , Security , protobuf +, rustfmt }: let pinData = lib.importJSON ./pin.json; @@ -21,6 +22,7 @@ rustPlatform.buildRustPackage rec { repo = "lemmy"; rev = version; sha256 = pinData.serverSha256; + fetchSubmodules = true; }; cargoSha256 = pinData.serverCargoSha256; @@ -37,7 +39,7 @@ rustPlatform.buildRustPackage rec { PROTOC = "${protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; - nativeBuildInputs = [ protobuf ]; + nativeBuildInputs = [ protobuf rustfmt ]; passthru.updateScript = ./update.sh;