Version 0.14.1 (#558)

ow-mods · Jul 3, 2024 · c9c0cb4 · c9c0cb4
2 parents 1073e2a + d7e31ae
commit c9c0cb4
Show file tree

Hide file tree

Showing 44 changed files with 6,841 additions and 4,162 deletions.
diff --git a/.github/workflows/ci_js.yml b/.github/workflows/ci_js.yml
@@ -33,33 +33,13 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v2
-        with:
-          version: 8
-          run_install: false
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+          node-version-file: owmods_gui/frontend/package.json
 
       - name: Install Dependencies
-        run: pnpm install
+        run: npm install
 
       - name: Lint
-        run: pnpm lint-dry
+        run: npm run lint-dry
 
       - name: Check Formatting
-        run: pnpm prettier-check
+        run: npm run prettier-check
diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml
@@ -41,34 +41,14 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v2
-        with:
-          version: 8
-          run_install: false
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ matrix.platform }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ matrix.platform }}-pnpm-store-
+          node-version-file: owmods_gui/frontend/package.json
 
       - name: Install Frontend Dependencies
         working-directory: owmods_gui/frontend
-        run: pnpm install
+        run: npm install
 
       - name: Install Tauri CLI
-        run: pnpm add -g @tauri-apps/cli
+        run: npm add -g @tauri-apps/cli
 
       - name: Build GUI
         run: tauri build --ci -b $([[ ${{ matrix.platform }} = 'windows-latest' ]] && echo 'msi nsis' || echo 'appimage deb')

diff --git a/.github/workflows/release_gui.yml b/.github/workflows/release_gui.yml
@@ -36,31 +36,11 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v2
-        with:
-          version: 8
-          run_install: false
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ matrix.platform }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ matrix.platform }}-pnpm-store-
+          node-version-file: owmods_gui/frontend/package.json
 
       - name: Install Frontend Dependencies
         working-directory: owmods_gui/frontend
-        run: pnpm install
+        run: npm install
 
       - name: Build GUI
         uses: tauri-apps/tauri-action@dev

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -12,7 +12,7 @@
       "type": "node-terminal",
       "request": "launch",
       "cwd": "${workspaceFolder}/owmods_gui/frontend",
-      "command": "pnpm dev"
+      "command": "npm run dev"
     }
   ]
 }
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -74,7 +74,7 @@ I tried to automate this process in a way that makes sense but it still needs so
    3. `owmods_gui/backend/Cargo.toml` - **also update the reference to owmods_core if it was updated**
    4. `nix/owmods-cli.nix`
    5. `nix/owmods-gui.nix`
-   6. `owmods_gui/frontend/package.json` - used by `pnpm2nix` to generate a derivation for the frontend
+   6. `owmods_gui/frontend/package.json`
    7. `xtask/Cargo.toml` - not the end of the world if you don't update this, determines the version shown in man pages for the CLI
 2. Merge `dev` to `main` (assuming you have a PR going)
 3. Run the "Create Core Release" action