Update element-web

ipfs/kubo/default.nix

@@ -48,7 +48,7 @@ in
     outputs = ["out" "systemd_unit" "systemd_unit_hardened"];
 
     buildPhase = ''
-        make build
+      make build
     '';
 
     installPhase = ''

linux/bcachefs/default.nix

@@ -1,21 +1,22 @@
-{ lib,
+{
+  lib,
   fetchFromGitHub,
   buildLinux,
   ...
-} @ args:
+} @ args: let
-
+  modDirVersion = "6.3.0";
-let 
+  source = builtins.fromJSON (builtins.readFile ./source.json);
-    modDirVersion = "6.3.0";
+in
-    source = builtins.fromJSON (builtins.readFile ./source.json);
+  buildLinux (args
-in buildLinux (args // {
+    // {
-    inherit modDirVersion;
+      inherit modDirVersion;
-    version = "6.3.0+${source.rev}";
+      version = "6.3.0+${source.rev}";
-    src = fetchFromGitHub {
+      src = fetchFromGitHub {
         owner = "koverstreet";
         repo = "bcachefs";
         inherit (source) rev sha256;
-    };
+      };
-    structuredExtraConfig = with lib.kernel; {
+      structuredExtraConfig = with lib.kernel; {
         BCACHEFS_FS = module;
         BCACHEFS_DEBUG = yes;
         KALLSYMS = yes;
@@ -23,10 +24,10 @@ in buildLinux (args // {
         DEBUG_FS = yes;
         DYNAMIC_FTRACE = yes;
         FTRACE = yes;
-    };
+      };
-    passthru.updateScript = [
+      passthru.updateScript = [
         ../../scripts/update-git.sh
         "github.com/koverstreet/bcachefs"
         "linux/bcachefs/source.json"
-    ];
+      ];
-})
+    })

matrix/element-web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.11.30",
+    "version": "1.11.31",
     "description": "A feature-rich client for Matrix.org",
     "author": "New Vector Ltd.",
     "repository": {
@@ -61,7 +61,8 @@
         "lint:style": "stylelint \"res/css/**/*.pcss\"",
         "test": "jest",
         "coverage": "yarn test --coverage",
-        "analyse:unused-exports": "node ./scripts/analyse_unused_exports.js"
+        "analyse:unused-exports": "node ./scripts/analyse_unused_exports.js",
+        "analyse:webpack-bundles": "webpack-bundle-analyzer webpack-stats.json webapp"
     },
     "resolutions": {
         "@types/react-dom": "17.0.19",
@@ -69,7 +70,7 @@
     },
     "dependencies": {
         "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz",
-        "@matrix-org/react-sdk-module-api": "^0.0.4",
+        "@matrix-org/react-sdk-module-api": "^0.0.5",
         "gfm.css": "^1.1.2",
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
@@ -122,7 +123,7 @@
         "cpx": "^1.5.0",
         "css-loader": "^4",
         "dotenv": "^16.0.2",
-        "eslint": "8.38.0",
+        "eslint": "8.39.0",
         "eslint-config-google": "^0.14.0",
         "eslint-config-prettier": "^8.5.0",
         "eslint-plugin-deprecate": "^0.7.0",
@@ -162,7 +163,7 @@
         "postcss-preset-env": "^6.7.0",
         "postcss-scss": "^4.0.4",
         "postcss-simple-vars": "^5.0.2",
-        "prettier": "2.8.7",
+        "prettier": "2.8.8",
         "raw-loader": "^4.0.2",
         "rimraf": "^5.0.0",
         "semver": "^7.3.7",
@@ -170,13 +171,14 @@
         "string-replace-loader": "3",
         "style-loader": "2",
         "stylelint": "^15.3.0",
-        "stylelint-config-standard": "^32.0.0",
+        "stylelint-config-standard": "^33.0.0",
-        "stylelint-scss": "^4.2.0",
+        "stylelint-scss": "^5.0.0",
         "terser-webpack-plugin": "^4.0.0",
         "ts-node": "^10.9.1",
         "ts-prune": "^0.10.3",
         "typescript": "5.0.4",
         "webpack": "^4.46.0",
+        "webpack-bundle-analyzer": "^4.8.0",
         "webpack-cli": "^3.3.12",
         "webpack-dev-server": "^3.11.2",
         "worker-loader": "^3.0.0",

matrix/element-web/source.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/maunium/element-web",
-  "rev": "d5f456519e7e20b94c8512e212420734cf5c4ceb",
+  "rev": "b1d4e83f9fd3a08e6bb02b07dfaf885420a4d67e",
-  "date": "2023-04-30T16:41:35+03:00",
+  "date": "2023-05-16T13:09:50+03:00",
-  "path": "/nix/store/29q1rmdjd6saj3phvpjwrx760xfvajd8-element-web",
+  "path": "/nix/store/x7sakad3105v0kpph5xpddpjrbhgrqaj-element-web",
-  "sha256": "1l0h94jj5xfqy4hg4rbf4f4x3a1yx12737j3cxqwq23hn9fqi1m3",
+  "sha256": "1h7mpnqkrwf4anjgfs730z3la4rshgzhqwrz33qx4jdzlq7301nv",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

overlay.nix

@@ -85,7 +85,7 @@ system: self: super: let
       wordpress-plugins = self.callPackage ./web/wordpress-plugins {};
       wordpress-themes = self.callPackage ./web/wordpress-themes {};
       kubo = self.callPackage ./ipfs/kubo {};
-      linux-bcachefs = self.callPackage ./linux/bcachefs { kernelPatches = []; };
+      linux-bcachefs = self.callPackage ./linux/bcachefs {kernelPatches = [];};
     })
     riscv-overlay
   ];