From 13fae6142cea263714198e815dfdcb8fe72e1a57 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Thu, 15 Feb 2024 22:27:32 +0200 Subject: [PATCH] lemmy-server/ui: 0.18.5 -> 0.19.3 --- pkgs/servers/web-apps/lemmy/package.json | 146 ++++++++++++----------- pkgs/servers/web-apps/lemmy/pin.json | 12 +- pkgs/servers/web-apps/lemmy/server.nix | 5 + 3 files changed, 86 insertions(+), 77 deletions(-) diff --git a/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json index 5b7f477f7c29..813c77507225 100644 --- a/pkgs/servers/web-apps/lemmy/package.json +++ b/pkgs/servers/web-apps/lemmy/package.json @@ -1,19 +1,19 @@ { "name": "lemmy-ui", - "version": "0.18.5", "description": "An isomorphic UI for lemmy", - "repository": "https://github.com/LemmyNet/lemmy-ui", - "license": "AGPL-3.0", + "version": "0.19.3", "author": "Dessalines ", + "license": "AGPL-3.0", "scripts": { "analyze": "webpack --mode=none", - "prebuild:dev": "yarn clean && node generate_translations.js", "build:dev": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=development", - "prebuild:prod": "yarn clean && node generate_translations.js", "build:prod": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=production", "clean": "yarn run rimraf dist", "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}\"", + "postinstall": "husky install", + "prebuild:dev": "yarn clean && node generate_translations.js", + "prebuild:prod": "yarn clean && node generate_translations.js", "prepare": "husky install", "themes:build": "sass src/assets/css/themes/:src/assets/css/themes", "themes:watch": "sass --watch src/assets/css/themes/:src/assets/css/themes", @@ -21,120 +21,124 @@ "translations:init": "git submodule init && yarn translations:update", "translations:update": "git submodule update --remote --recursive" }, - "lint-staged": { - "*.{ts,tsx,js}": [ - "prettier --write", - "eslint --fix" - ], - "*.{css, scss}": [ - "prettier --write" - ], - "package.json": [ - "sortpack" - ] + "repository": "https://github.com/LemmyNet/lemmy-ui", + "engines": { + "node": ">=8.9.0" }, "dependencies": { - "@babel/plugin-proposal-decorators": "^7.21.5", - "@babel/plugin-transform-runtime": "^7.21.5", - "@babel/plugin-transform-typescript": "^7.21.5", - "@babel/preset-env": "7.21.5", + "@babel/plugin-proposal-class-properties": "^7.18.6", + "@babel/plugin-proposal-decorators": "^7.23.7", + "@babel/plugin-transform-runtime": "^7.23.7", + "@babel/plugin-transform-typescript": "^7.23.6", + "@babel/preset-env": "^7.23.8", "@babel/preset-typescript": "^7.21.5", - "@babel/runtime": "^7.21.5", + "@babel/runtime": "^7.23.8", "@emoji-mart/data": "^1.1.0", + "@shortcm/qr-image": "^9.0.2", "autosize": "^6.0.1", - "babel-loader": "^9.1.2", - "babel-plugin-inferno": "^6.6.0", + "babel-loader": "^9.1.3", + "babel-plugin-inferno": "^6.7.1", "bootstrap": "^5.3.1", "check-password-strength": "^2.0.7", - "classnames": "^2.3.1", + "classnames": "^2.5.1", "clean-webpack-plugin": "^4.0.0", - "cookie": "^0.5.0", - "copy-webpack-plugin": "^11.0.0", - "cross-fetch": "^4.0.0", - "css-loader": "^6.7.3", - "date-fns": "^2.30.0", + "cookie": "^0.6.0", + "copy-webpack-plugin": "^12.0.2", + "css-loader": "^6.9.1", + "date-fns": "^3.2.0", "emoji-mart": "^5.4.0", "emoji-short-name": "^2.0.0", "express": "~4.18.2", "history": "^5.3.0", "html-to-text": "^9.0.5", - "i18next": "^23.3.0", - "inferno": "^8.2.2", - "inferno-create-element": "^8.2.2", + "husky": "^8.0.3", + "i18next": "^23.7.16", + "inferno": "^8.2.3", + "inferno-create-element": "^8.2.3", "inferno-helmet": "^5.2.1", - "inferno-hydrate": "^8.2.2", + "inferno-hydrate": "^8.2.3", "inferno-i18next-dess": "0.0.2", - "inferno-router": "^8.2.2", - "inferno-server": "^8.2.2", - "jwt-decode": "^3.1.2", - "lemmy-js-client": "0.18.1", + "inferno-router": "^8.2.3", + "inferno-server": "^8.2.3", + "jwt-decode": "^4.0.0", + "lemmy-js-client": "0.19.2-alpha.1", "lodash.isequal": "^4.5.0", - "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": "^14.0.0", + "markdown-it-bidi": "^0.1.0", + "markdown-it-container": "^4.0.0", + "markdown-it-emoji": "^3.0.0", + "markdown-it-footnote": "^4.0.0", + "markdown-it-highlightjs": "^4.0.1", "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", + "markdown-it-sub": "^2.0.0", + "markdown-it-sup": "^2.0.0", + "mini-css-extract-plugin": "^2.7.7", "register-service-worker": "^1.7.2", "run-node-webpack-plugin": "^1.3.0", + "rxjs": "^7.8.1", "sanitize-html": "^2.11.0", - "sass": "^1.64.1", - "sass-loader": "^13.3.2", - "serialize-javascript": "^6.0.1", + "sass": "^1.70.0", + "sass-loader": "^14.0.0", + "serialize-javascript": "^6.0.2", "service-worker-webpack": "^1.0.0", - "sharp": "^0.32.4", + "sharp": "0.32.6", "tippy.js": "^6.3.7", "toastify-js": "^1.12.0", "tributejs": "^5.1.3", - "webpack": "5.88.2", + "webpack": "^5.89.0", "webpack-cli": "^5.1.4", "webpack-node-externals": "^3.0.0" }, "devDependencies": { - "@babel/core": "^7.21.5", - "@babel/plugin-proposal-class-properties": "^7.18.6", + "@babel/core": "^7.23.7", "@types/autosize": "^4.0.0", "@types/bootstrap": "^5.2.6", - "@types/cookie": "^0.5.1", + "@types/cookie": "^0.6.0", "@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": "^13.0.7", "@types/markdown-it-container": "^2.0.6", - "@types/node": "^20.4.5", + "@types/node": "^20.11.5", "@types/path-browserify": "^1.0.0", "@types/sanitize-html": "^2.9.0", "@types/serialize-javascript": "^5.0.1", "@types/toastify-js": "^1.12.0", - "@typescript-eslint/eslint-plugin": "^6.2.0", - "@typescript-eslint/parser": "^6.2.0", - "eslint": "^8.45.0", - "eslint-plugin-inferno": "^7.32.2", + "@typescript-eslint/eslint-plugin": "^6.19.0", + "@typescript-eslint/parser": "^6.19.0", + "eslint": "^8.56.0", + "eslint-plugin-inferno": "^7.33.3", "eslint-plugin-jsx-a11y": "^6.7.1", - "eslint-plugin-prettier": "^5.0.0", - "husky": "^8.0.3", + "eslint-plugin-prettier": "^5.1.3", "import-sort-style-module": "^6.0.0", - "lint-staged": "^13.2.3", - "prettier": "^3.0.0", + "lint-staged": "^15.2.0", + "prettier": "^3.2.4", "prettier-plugin-import-sort": "^0.0.7", "prettier-plugin-organize-imports": "^3.2.3", - "prettier-plugin-packagejson": "^2.4.5", + "prettier-plugin-packagejson": "^2.4.9", "rimraf": "^5.0.0", - "sortpack": "^2.3.4", - "style-loader": "^3.3.2", - "terser": "^5.19.2", - "typescript": "^5.1.6", - "typescript-language-server": "^3.3.2", + "sortpack": "^2.4.0", + "style-loader": "^3.3.4", + "terser": "^5.27.0", + "typescript": "^5.3.3", + "typescript-language-server": "^4.3.1", "webpack-bundle-analyzer": "^4.9.0", "webpack-dev-server": "4.15.1" }, - "packageManager": "yarn@1.22.19", - "engines": { - "node": ">=8.9.0" + "lint-staged": { + "*.{css, scss}": [ + "prettier --write" + ], + "*.{ts,tsx,js}": [ + "prettier --write", + "eslint --fix" + ], + "package.json": [ + "sortpack" + ] }, + "packageManager": "yarn@1.22.19", "engineStrict": true, "importSort": { ".js, .jsx, .ts, .tsx": { diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index f7a4d855f406..fdab1c9d63d6 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,8 +1,8 @@ { - "serverVersion": "0.18.5", - "uiVersion": "0.18.5", - "serverHash": "sha256-tj8zryCzW3r6VGiNGlI5eo0I+rJfhTUOGtb3YieodpQ=", - "serverCargoHash": "sha256-80jk1GhnXos+lil3joEtPwJjsE8qSEm/WinCfZ3CF/c=", - "uiHash": "sha256-fyXKhVTFc1+gG2TXb9l/YkcwRt/p7DWtB1FO5mpQ3i4=", - "uiYarnDepsHash": "sha256-rLP1CQd75nVfI6C0sC21TUskzVfbGHm2fblcYr6JcGc=" + "serverVersion": "0.19.3", + "uiVersion": "0.19.3", + "serverHash": "sha256-iO7bY2oChx0cZbwgXMrrV4e1kffop9s4xmepNywnApU=", + "serverCargoHash": "sha256-XXfg0o/LQ/imnsHsREoBXMDP1hU5Stxv0s6AP+o+USc=", + "uiHash": "sha256-6GGiKCNL0PALdz0W0d1OOPyMIA5kaoL3148j9GWzrMM=", + "uiYarnDepsHash": "sha256-UQ+B2vF34L+HuisyO7wdW2zCfEEGa8YdnoaB4jHi+DY=" } diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 1f5d3b8b4cea..4f605b0b2dbd 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -46,6 +46,11 @@ rustPlatform.buildRustPackage rec { PROTOC_INCLUDE = "${protobuf}/include"; nativeBuildInputs = [ protobuf rustfmt ]; + checkFlags = [ + # test requires database access + "--skip=session_middleware::tests::test_session_auth" + ]; + passthru.updateScript = ./update.py; passthru.tests.lemmy-server = nixosTests.lemmy;