moved vue-node-18 out of historical and into active

replit · Jun 27, 2024 · ff0ab48 · ff0ab48
1 parent 295f2d4
commit ff0ab48
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/pkgs/historical-modules/default.nix b/pkgs/historical-modules/default.nix
@@ -180,16 +180,6 @@ let
         displayVersion = "5";
       };
     }
-    {
-      moduleId = "vue-node-18";
-      commit = "3ea4bcdbdc3c5e3c09b37b07edcd61781f9695f7";
-      overrides = {
-        # /nix/store/623sn0cy54r5csab3d9fmg55di6r4dd3-replit-module-vue-node-18
-        # .runners["dev-runner"].displayVersion = "18.18.2";
-        name = "Vue Tools with Node.js";
-        displayVersion = "18";
-      };
-    }
     {
       moduleId = "zig-0.11";
       commit = "15426ef79793bf7c424eb40865d507eacfdd44e6";

diff --git a/pkgs/modules/default.nix b/pkgs/modules/default.nix
@@ -99,7 +99,12 @@ let
     )
     (import ./swift)
     (import ./svelte-kit)
-    (import ./vue)
+    (import ./vue {
+      nodejs = pkgs.nodejs_20;
+    })
+    (import ./vue {
+      nodejs = pkgs.nodejs_18;
+    })
     (import ./web)
     (import ./hermit)
     (import ./typescript-language-server {

diff --git a/pkgs/modules/vue/default.nix b/pkgs/modules/vue/default.nix
@@ -1,19 +1,22 @@
-{ pkgs, ... }:
+{ nodejs }:
+{ pkgs, lib, ... }:
 
 let
-  nodejs = pkgs.nodejs_20;
   nodepkgs = nodejs.pkgs;
+  node-version = lib.versions.major nodejs.version;
 
-  vue-language-server = pkgs.callPackage ../../vue-language-server { };
+  vue-language-server = pkgs.callPackage ../../vue-language-server {
+    inherit nodejs;
+  };
 
   language = "vue";
   extensions = [ ".vue" ".js" ".mjs" ".cjs" ".jsx" ".ts" ".tsx" ".json" ".html" ".css" ];
 in
 
 {
-  id = "vue-node-20";
+  id = "vue-node-${node-version}";
   name = "Vue Tools with Node.js";
-  displayVersion = "20";
+  displayVersion = node-version;
   description = ''
     Vue.js development tools. Includes Node.js, Bun, pnpm, yarn, Vue language tools.
   '';

diff --git a/pkgs/vue-language-server/default.nix b/pkgs/vue-language-server/default.nix
@@ -1,6 +1,7 @@
 # TODO: upstream this file into nixpkgs
 { buildNpmPackage
 , fetchurl
+, nodejs
 }:
 
 buildNpmPackage rec {
@@ -22,5 +23,7 @@ buildNpmPackage rec {
   meta = {
     mainProgram = "vue-language-server";
   };
+
+  inherit nodejs;
 }