Merge remote-tracking branch 'origin/dev-spago-next' into dev

flake.nix

@@ -57,69 +57,64 @@
     
       in
         {
-          packages = {
+          packages = rec {
             compile = pkgs.writeShellApplication {
               name = "compile";
               runtimeInputs = dependencies;
               text = ''
-              #!${pkgs.stdenv.shell}
               set -e
 
               echo "Installing JS Dependencies"
-              #${pkgs.nodePackages.npm}/bin/npm install
+              #npm install
               # https://docs.npmjs.com/cli/v9/commands/npm-ci
-              ${pkgs.nodePackages.npm}/bin/npm ci
-              #${pkgs.nodePackages.npm}/bin/npm install --dev
+              npm ci
+              #npm/bin/npm install --dev
           
               echo "Compiling"
-              ${pkgs.nodePackages.npm}/bin/npm run build
+              npm run build
               '';
             };
             build = pkgs.writeShellApplication {
               name = "build";
-              runtimeInputs = dependencies;
+              runtimeInputs = [ compile ] ++ dependencies;
               text = ''
-              #!${pkgs.stdenv.shell}
               set -e
 
-              ${self.packages.${system}.compile}/bin/compile
+              compile
 
               echo "Bundling"
-              ${pkgs.nodePackages.npm}/bin/npm run bundle              
+              npm run bundle              
               '';
             };
             test-ps = pkgs.writeShellApplication {
               name = "test-ps";
-              runtimeInputs = dependencies;
+              runtimeInputs = [ compile ] ++ dependencies;
               text = ''
-              #!${pkgs.stdenv.shell}
               set -e
           
-              ${self.packages.${system}.compile}/bin/compile
+              compile
           
               echo "Testing"
-              ${pkgs.nodePackages.npm}/bin/npm run test
+              npm run test
             '';
             };    
             repl = pkgs.writeShellApplication {
               name = "repl";
-              runtimeInputs = dependencies;
+              runtimeInputs = [ compile ] ++ dependencies;
               text = ''
-              #!${pkgs.stdenv.shell}
           
-              ${pkgs.nodePackages.npm}/bin/npm run repl
+              npm run repl
             '';
             };
             
             build-css = pkgs.writeShellApplication {
               name = "build-css";
-              runtimeInputs = dependencies;
+              runtimeInputs = [ compile ] ++ dependencies;
               text = ''
-              #!${pkgs.stdenv.shell}
               set -e
           
               #yarn css
-              ${pkgs.nodePackages.npm}/bin/npm run css
+              npm run css
             '';
             };
           };