Merge pull request #242155 from adisbladis/lemmy-0_18_1
lemmy-{ui,server}: 0.18.0 -> 0.18.1
This commit is contained in:
adisbladis
GitHub
commit
038752b14e
@ -250,9 +250,9 @@ in
|
||||
|
||||
environment = {
|
||||
LEMMY_UI_HOST = "127.0.0.1:${toString cfg.ui.port}";
|
||||
LEMMY_INTERNAL_HOST = "127.0.0.1:${toString cfg.settings.port}";
|
||||
LEMMY_EXTERNAL_HOST = cfg.settings.hostname;
|
||||
LEMMY_HTTPS = "false";
|
||||
LEMMY_UI_LEMMY_INTERNAL_HOST = "127.0.0.1:${toString cfg.settings.port}";
|
||||
LEMMY_UI_LEMMY_EXTERNAL_HOST = cfg.settings.hostname;
|
||||
LEMMY_UI_HTTPS = "false";
|
||||
};
|
||||
|
||||
documentation = [
|
||||
|
||||
@ -25,8 +25,6 @@ in
|
||||
site_name = "Lemmy FTW";
|
||||
admin_email = "mightyiam@example.com";
|
||||
};
|
||||
# https://github.com/LemmyNet/lemmy/blob/50efb1d519c63a7007a07f11cc8a11487703c70d/crates/utils/src/settings/mod.rs#L52
|
||||
database.uri = "postgres:///lemmy?host=/run/postgresql&user=lemmy";
|
||||
};
|
||||
secretFile = /etc/lemmy-config.hjson;
|
||||
caddy.enable = true;
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
{
|
||||
"name": "lemmy-ui",
|
||||
"version": "0.18.0",
|
||||
"version": "0.18.1",
|
||||
"description": "An isomorphic UI for lemmy",
|
||||
"repository": "https://github.com/LemmyNet/lemmy-ui",
|
||||
"license": "AGPL-3.0",
|
||||
"author": "Dessalines <tyhou13@gmx.com>",
|
||||
"scripts": {
|
||||
"analyze": "webpack --mode=none",
|
||||
"prebuild:dev": "yarn clean && node generate_translations.js",
|
||||
"build:dev": "webpack --mode=development",
|
||||
"build:dev": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=development",
|
||||
"prebuild:prod": "yarn clean && node generate_translations.js",
|
||||
"build:prod": "webpack --mode=production",
|
||||
"build:prod": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=production",
|
||||
"clean": "yarn run rimraf dist",
|
||||
"dev": "yarn start",
|
||||
"dev": "yarn build:dev --watch",
|
||||
"lint": "yarn translations:generate && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx \"src/**\" && prettier --check \"src/**/*.{ts,tsx,js,css,scss}\"",
|
||||
"prepare": "husky install",
|
||||
"start": "yarn build:dev --watch",
|
||||
"themes:build": "sass src/assets/css/themes/:src/assets/css/themes",
|
||||
"themes:watch": "sass --watch src/assets/css/themes/:src/assets/css/themes",
|
||||
"translations:generate": "node generate_translations.js",
|
||||
@ -48,9 +48,11 @@
|
||||
"check-password-strength": "^2.0.7",
|
||||
"classnames": "^2.3.1",
|
||||
"clean-webpack-plugin": "^4.0.0",
|
||||
"cookie": "^0.5.0",
|
||||
"copy-webpack-plugin": "^11.0.0",
|
||||
"cross-fetch": "^3.1.5",
|
||||
"css-loader": "^6.7.3",
|
||||
"date-fns": "^2.30.0",
|
||||
"emoji-mart": "^5.4.0",
|
||||
"emoji-short-name": "^2.0.0",
|
||||
"express": "~4.18.2",
|
||||
@ -64,19 +66,19 @@
|
||||
"inferno-i18next-dess": "0.0.2",
|
||||
"inferno-router": "^8.1.1",
|
||||
"inferno-server": "^8.1.1",
|
||||
"isomorphic-cookie": "^1.2.4",
|
||||
"jwt-decode": "^3.1.2",
|
||||
"lemmy-js-client": "0.18.0-rc.2",
|
||||
"lodash": "^4.17.21",
|
||||
"lodash.isequal": "^4.5.0",
|
||||
"lodash.merge": "^4.6.2",
|
||||
"markdown-it": "^13.0.1",
|
||||
"markdown-it-container": "^3.0.0",
|
||||
"markdown-it-emoji": "^2.0.2",
|
||||
"markdown-it-footnote": "^3.0.3",
|
||||
"markdown-it-html5-embed": "^1.0.0",
|
||||
"markdown-it-ruby": "^0.1.1",
|
||||
"markdown-it-sub": "^1.0.0",
|
||||
"markdown-it-sup": "^1.0.0",
|
||||
"mini-css-extract-plugin": "^2.7.5",
|
||||
"moment": "^2.29.4",
|
||||
"register-service-worker": "^1.7.2",
|
||||
"run-node-webpack-plugin": "^1.3.0",
|
||||
"sanitize-html": "^2.10.0",
|
||||
@ -96,11 +98,14 @@
|
||||
"@babel/core": "^7.21.8",
|
||||
"@types/autosize": "^4.0.0",
|
||||
"@types/bootstrap": "^5.2.6",
|
||||
"@types/cookie": "^0.5.1",
|
||||
"@types/express": "^4.17.17",
|
||||
"@types/html-to-text": "^9.0.0",
|
||||
"@types/lodash.isequal": "^4.5.6",
|
||||
"@types/markdown-it": "^12.2.3",
|
||||
"@types/markdown-it-container": "^2.0.5",
|
||||
"@types/node": "^20.1.2",
|
||||
"@types/path-browserify": "^1.0.0",
|
||||
"@types/sanitize-html": "^2.9.0",
|
||||
"@types/serialize-javascript": "^5.0.1",
|
||||
"@types/toastify-js": "^1.11.1",
|
||||
@ -122,6 +127,8 @@
|
||||
"style-loader": "^3.3.2",
|
||||
"terser": "^5.17.3",
|
||||
"typescript": "^5.0.4",
|
||||
"typescript-language-server": "^3.3.2",
|
||||
"webpack-bundle-analyzer": "^4.9.0",
|
||||
"webpack-dev-server": "4.15.0"
|
||||
},
|
||||
"packageManager": "yarn@1.22.19",
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"version": "0.18.0",
|
||||
"serverSha256": "sha256-KzEelj2/+wfp570Vw1+FoqiYZd1PxELTdopGSeel97E=",
|
||||
"serverCargoSha256": "sha256-p1ZytuaXouKFkKjsEsaNjndoioTSVVM2pf72qE8/qyM=",
|
||||
"uiSha256": "sha256-pB6uEL9gDwvsi+FbooKBhTCJ+Qmc6Vl2bBTMiL1hUJI=",
|
||||
"uiYarnDepsSha256": "sha256-NtluS6Cr39L9nGwNA17c7xsM5xoJraS02a7sp7r9KPI="
|
||||
"version": "0.18.1",
|
||||
"serverSha256": "sha256-jYbrbIRyXo2G113ReG32oZ56ed2FEB/ZBcqYAxoxzGQ=",
|
||||
"serverCargoSha256": "sha256-7DNMNPSjzYY45DlR6Eo2q6QdwrMrRb51cFOnXfOuub0=",
|
||||
"uiSha256": "sha256-tc7fGA4okIv+3kq5t6I+EN+owdekCgAdk0EtkDgodIU=",
|
||||
"uiYarnDepsSha256": "sha256-/T1PQ0XsGY82/RlLq94hJgv8Yx1bIf2gcklhgtPu1RM="
|
||||
}
|
||||
|
||||
@ -26,11 +26,6 @@ rustPlatform.buildRustPackage rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# `cargo test` fails as `tokio::test` relies on the macros feature which wasn't specified in Cargo.toml
|
||||
./tokio-macros.patch
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
echo 'pub const VERSION: &str = "${version}";' > crates/utils/src/version.rs
|
||||
'';
|
||||
@ -58,7 +53,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "🐀 Building a federated alternative to reddit in rust";
|
||||
homepage = "https://join-lemmy.org/";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ happysalada billewanick ];
|
||||
maintainers = with maintainers; [ happysalada billewanick adisbladis ];
|
||||
mainProgram = "lemmy_server";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
From f8c83b48774d152f9bc590db83c032235ef502a9 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Klass <kissaki@posteo.de>
|
||||
Date: Sat, 24 Jun 2023 17:57:59 +0200
|
||||
Subject: [PATCH] test: Fix missing tokio test macro dependency
|
||||
|
||||
The tests make use of the `#[tokio::test]` macro, but the tokio dependency default feature does not include them. Running cargo test fails.
|
||||
|
||||
By including the `macros` feature on the tokio dependency, cargo test will work.
|
||||
|
||||
---
|
||||
|
||||
cargo test fails with
|
||||
|
||||
```
|
||||
error[E0433]: failed to resolve: could not find `test` in `tokio`
|
||||
--> src\scheduled_tasks.rs:295:12
|
||||
|
|
||||
295 | #[tokio::test]
|
||||
| ^^^^ could not find `test` in `tokio`
|
||||
```
|
||||
---
|
||||
Cargo.toml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 430deb082c..d4c5ab8ef0 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -89,7 +89,7 @@ anyhow = "1.0.71"
|
||||
diesel_ltree = "0.3.0"
|
||||
typed-builder = "0.10.0"
|
||||
serial_test = "0.9.0"
|
||||
-tokio = "1.28.2"
|
||||
+tokio = { version = "1.28.2", features = ["macros"] }
|
||||
sha2 = "0.10.6"
|
||||
regex = "1.8.4"
|
||||
once_cell = "1.18.0"
|
||||
@ -84,7 +84,7 @@ mkYarnPackage {
|
||||
description = "Building a federated alternative to reddit in rust";
|
||||
homepage = "https://join-lemmy.org/";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ happysalada billewanick ];
|
||||
maintainers = with maintainers; [ happysalada billewanick adisbladis ];
|
||||
inherit (nodejs.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user