Merge pull request #253657 from dotlambda/listmonk-fetchYarnDeps

listmonk.frontend: use fetchYarnDeps
NixOS · Sep 6, 2023 · 90cd212 · 90cd212
2 parents 8e64f40 + 6083d3d
commit 90cd212
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 21,431 deletions.
diff --git a/pkgs/servers/mail/listmonk/frontend.nix b/pkgs/servers/mail/listmonk/frontend.nix
@@ -1,5 +1,6 @@
 { yarn2nix-moretea
 , fetchFromGitHub
+, fetchYarnDeps
 , meta
 }:
 
@@ -15,8 +16,12 @@ yarn2nix-moretea.mkYarnPackage rec {
   };
 
   packageJSON = ./package.json;
-  yarnLock = ./yarn.lock;
-  yarnNix = ./yarn.nix;
+  yarnLock = "${src}/frontend/yarn.lock";
+
+  offlineCache = fetchYarnDeps {
+    inherit yarnLock;
+    hash = "sha256-KKNk4lrM7unMFClkY6F3nqhKx5xfx87Ac+rug9sOwvI=";
+  };
 
   # For Node.js v17+, this is necessary.
   NODE_OPTIONS = "--openssl-legacy-provider";

diff --git a/pkgs/servers/mail/listmonk/package.json b/pkgs/servers/mail/listmonk/package.json
@@ -19,22 +19,22 @@
     "indent.js": "^0.3.5",
     "qs": "^6.10.1",
     "textversionjs": "^1.1.3",
-    "tinymce": "^5.10.0",
+    "tinymce": "^5.10.7",
     "turndown": "^7.0.0",
     "vue": "^2.6.12",
     "vue-i18n": "^8.22.2",
     "vue-router": "^3.2.0",
     "vuex": "^3.6.2"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.13",
-    "@vue/cli-plugin-eslint": "~4.5.13",
-    "@vue/cli-plugin-router": "~4.5.13",
-    "@vue/cli-plugin-vuex": "~4.5.13",
-    "@vue/cli-service": "~4.5.13",
+    "@vue/cli-plugin-babel": "~5.0.8",
+    "@vue/cli-plugin-eslint": "~5.0.8",
+    "@vue/cli-plugin-router": "~5.0.8",
+    "@vue/cli-plugin-vuex": "~5.0.8",
+    "@vue/cli-service": "~5.0.8",
     "@vue/eslint-config-airbnb": "^5.3.0",
     "babel-eslint": "^10.1.0",
-    "cypress": "9.5.2",
+    "cypress": "10.10.0",
     "cypress-file-upload": "^5.0.2",
     "eslint": "^7.27.0",
     "eslint-plugin-import": "^2.23.3",