Merge pull request #34 from rainlanguage/2024-08-06-update-dotrain

bump dotrain dependency
rainlanguage · Aug 6, 2024 · dd88883 · dd88883
2 parents cdf1bd7 + 1933158
commit dd88883
Show file tree

Hide file tree

Showing 8 changed files with 1,098 additions and 742 deletions.
diff --git a/.github/workflows/manual-vscode-pre-release.yaml b/.github/workflows/manual-vscode-pre-release.yaml
@@ -11,17 +11,14 @@ jobs:
           fetch-depth: 0
           submodules: recursive
 
-      - uses: DeterminateSystems/nix-installer-action@v4
-      - uses: DeterminateSystems/magic-nix-cache-action@v2
-
-      - name: Install NodeJS v21
+      - name: Install NodeJS v22
         uses: actions/setup-node@v4
         with:
-          node-version: 21
+          node-version: 22
           cache: 'npm'
 
       - name: Install Deps
-        run:  nix run .#install
+        run:  npm install
 
       - name: Build Prod
         run:  npm run build-prod

diff --git a/.github/workflows/manual-vscode-release.yaml b/.github/workflows/manual-vscode-release.yaml
@@ -11,17 +11,14 @@ jobs:
           fetch-depth: 0
           submodules: recursive
 
-      - uses: DeterminateSystems/nix-installer-action@v4
-      - uses: DeterminateSystems/magic-nix-cache-action@v2
-
-      - name: Install NodeJS v21
+      - name: Install NodeJS v22
         uses: actions/setup-node@v4
         with:
-          node-version: 21
+          node-version: 22
           cache: 'npm'
 
       - name: Install Deps
-        run:  nix run .#install
+        run:  npm install
 
       - name: Build Prod
         run:  npm run build-prod

diff --git a/.github/workflows/rainix.yaml b/.github/workflows/rainix.yaml
@@ -9,17 +9,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: DeterminateSystems/nix-installer-action@v4
-      - uses: DeterminateSystems/magic-nix-cache-action@v2
-
-      - name: Install NodeJS v21
+      - name: Install NodeJS v22
         uses: actions/setup-node@v4
         with:
-          node-version: 21
+          node-version: 22
           cache: 'npm'
 
       - name: Install Deps
-        run:  nix run .#install
+        run:  npm install
 
       - name: Build Prod
         run:  npm run build-prod

diff --git a/flake.nix b/flake.nix
@@ -10,31 +10,11 @@
     let
       pkgs = rainix.pkgs.${system};
     in rec {
-      packages = {
-        install = rainix.mkTask.${system} {
-          name = "install";
-          body = ''
-            set -euxo pipefail
-            npm install
-          '';
-          additionalBuildInputs = [
-            pkgs.wasm-bindgen-cli
-            rainix.rust-toolchain.${system}
-            rainix.rust-build-inputs.${system}
-            rainix.node-build-inputs.${system}
-          ];
-        };
-      };
-
       # For `nix develop`:
       devShell = pkgs.mkShell {
         nativeBuildInputs = [
-          rainix.rust-toolchain.${system}
-          rainix.rust-build-inputs.${system}
           rainix.node-build-inputs.${system}
-        ] ++ (with pkgs; [ 
-          wasm-bindgen-cli
-        ]);
+        ];
       };
     }
   );