Unignore lock file

.github/workflows/lint.yml

@@ -7,21 +7,21 @@ on:
         branches:
             - main
 jobs:
-  Build:
+    Build:
-    runs-on: ubuntu-latest
+        runs-on: ubuntu-latest
 
-    steps:
+        steps:
-    - uses: actions/checkout@v3
+            - uses: actions/checkout@v3
-    - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
+            - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
-    
+
-    - name: Use Node.js 18
+            - name: Use Node.js 18
-      uses: actions/setup-node@v2
+              uses: actions/setup-node@v2
-      with:
+              with:
-        node-version: 18
+                  node-version: 18
-        cache: 'pnpm'
+                  cache: "pnpm"
-        
+
-    - name: Install dependencies
+            - name: Install dependencies
-      run: pnpm install
+              run: pnpm install --frozen-lockfile
-      
+
-    - name: Build aliucord
+            - name: Build aliucord
-      run: pnpm lint && pnpm build
+              run: pnpm lint && pnpm build

.gitignore

@@ -6,8 +6,6 @@ vencord_installer
 
 .idea
 
-# These are absolute pain causing merge conflicts
-pnpm-lock.yaml
 yarn.lock
 package-lock.json
 

docs/1_INSTALLING.md

@@ -4,12 +4,18 @@ Welcome to Megu's Installation Guide! In this file, you will learn about how to
 
 ## Sections
 
--   [Dependencies](#dependencies)
+- [Installation Guide](#installation-guide)
--   [Installing Vencord](#installing-vencord)
+  - [Sections](#sections)
--   [Updating Vencord](#updating-vencord)
+  - [Dependencies](#dependencies)
--   [Uninstalling Vencord](#uninstalling-vencord)
+  - [Installing Vencord](#installing-vencord)
--   [Manually Installing Vencord](#manually-installing-vencord)
+  - [Updating Vencord](#updating-vencord)
--   [Manually Uninstalling Vencord](#manually-uninstalling-vencord)
+  - [Uninstalling Vencord](#uninstalling-vencord)
+  - [Manually Installing Vencord](#manually-installing-vencord)
+    - [On Windows](#on-windows)
+    - [On Linux](#on-linux)
+    - [On MacOS](#on-macos)
+    - [Manual Patching](#manual-patching)
+    - [Manually Uninstalling Vencord](#manually-uninstalling-vencord)
 
 ## Dependencies
 
@@ -38,7 +44,7 @@ cd Vencord
 Install dependencies:
 
 ```shell
-pnpm install
+pnpm install --frozen-lockfile
 ```
 
 Build Vencord:
@@ -95,7 +101,7 @@ pnpm uninject
 The above command may ask you to also run:
 
 ```shell
-pnpm install
+pnpm install --frozen-lockfile
 pnpm uninject
 ```
 

scripts/patcher/install.js

@@ -5,7 +5,7 @@ const { execSync } = require("child_process");
 console.log("\nVencord Installer\n");
 
 if (!fs.existsSync(path.join(process.cwd(), "node_modules"))) {
-    console.log("You need to install dependencies first. Run:", "pnpm install");
+    console.log("You need to install dependencies first. Run:", "pnpm install --frozen-lockfile");
     process.exit(1);
 }
 

scripts/patcher/uninstall.js

@@ -4,7 +4,7 @@ const fs = require("fs");
 console.log("\nVencord Uninstaller\n");
 
 if (!fs.existsSync(path.join(process.cwd(), "node_modules"))) {
-    console.log("You need to install dependencies first. Run:", "pnpm install");
+    console.log("You need to install dependencies first. Run:", "pnpm install --frozen-lockfile");
     process.exit(1);
 }