Merge pull request #16 from Johannes7k75/main

.

.github/workflows/build.yml

@@ -18,14 +18,14 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
- - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
+ - uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json
 
- - name: Use Node.js 19
- uses: actions/setup-node@v3
+ - name: Use Node.js 20
+ uses: actions/setup-node@v4
  with:
- node-version: 19
+ node-version: 20
  cache: "pnpm"
 
  - name: Install dependencies

.github/workflows/codeberg-mirror.yml

@@ -13,7 +13,7 @@ jobs:
  if: github.repository == 'Vendicated/Vencord'
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  fetch-depth: 0
  - uses: pixta-dev/repository-mirroring-action@674e65a7d483ca28dafaacba0d07351bdcc8bd75 # v1.1.1

.github/workflows/publish.yml

@@ -10,7 +10,7 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - name: check that tag matches package.json version
  run: |
@@ -20,12 +20,12 @@ jobs:
  exit 1
  fi
 
- - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
+ - uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json
 
  - name: Use Node.js 19
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
  with:
- node-version: 19
+ node-version: 20
  cache: "pnpm"
 
  - name: Install dependencies

.github/workflows/reportBrokenPlugins.yml

@@ -21,10 +21,10 @@ jobs:
 
  - uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json
 
- - name: Use Node.js 18
+ - name: Use Node.js 20
  uses: actions/setup-node@v4
  with:
- node-version: 18
+ node-version: 20
  cache: "pnpm"
 
  - name: Install dependencies
@@ -35,7 +35,7 @@ jobs:
  id: setup-chrome
  uses: browser-actions/setup-chrome@82b9ce628cc5595478a9ebadc480958a36457dc2
  with:
- chrome-version: stable
+  chrome-version: stable
 
  - name: Build web
  run: pnpm buildWeb --standalone --dev

.github/workflows/test.yml

@@ -10,13 +10,13 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/checkout@v3
- - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
+ - uses: actions/checkout@v4
+ - uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json
 
- - name: Use Node.js 18
- uses: actions/setup-node@v3
+ - name: Use Node.js 20
+ uses: actions/setup-node@v4
  with:
- node-version: 18
+ node-version: 20
  cache: "pnpm"
 
  - name: Install dependencies

.npmrc

@@ -1 +1,2 @@
 strict-peer-dependencies=false
+package-manager-strict=false

.vscode/extensions.json

@@ -1,11 +1,9 @@
 {
  "recommendations": [
  "dbaeumer.vscode-eslint",
- "eamodio.gitlens",
  "EditorConfig.EditorConfig",
- "ExodiusStudios.comment-anchors",
- "formulahendry.auto-rename-tag",
  "GregorBiswanger.json2ts",
- "stylelint.vscode-stylelint"
+ "stylelint.vscode-stylelint",
+ "Vendicated.vencord-companion"
  ]
 }

package.json

@@ -1,7 +1,7 @@
 {
  "name": "vencord",
  "private": "true",
- "version": "1.8.1",
+ "version": "1.8.5",
  "description": "The cutest Discord client mod",
  "homepage": "https://github.com/Vendicated/Vencord#readme",
  "bugs": {
@@ -19,16 +19,17 @@
  "scripts": {
  "build": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/build.mjs",
  "buildWeb": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/buildWeb.mjs",
+ "watch": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/build.mjs --watch",
  "generatePluginJson": "tsx scripts/generatePluginList.ts",
+ "generateTypes": "tspc --emitDeclarationOnly --declaration --outDir packages/vencord-types",
  "inject": "node scripts/runInstaller.mjs",
+ "uninject": "node scripts/runInstaller.mjs",
  "lint": "eslint . --ext .js,.jsx,.ts,.tsx --ignore-pattern src/userplugins",
  "lint-styles": "stylelint \"src/**/*.css\" --ignore-pattern src/userplugins",
  "lint:fix": "pnpm lint --fix",
  "test": "pnpm build && pnpm lint && pnpm lint-styles && pnpm testTsc && pnpm generatePluginJson",
  "testWeb": "pnpm lint && pnpm buildWeb && pnpm testTsc",
- "testTsc": "tsc --noEmit",
- "uninject": "node scripts/runInstaller.mjs",
- "watch": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/build.mjs --watch"
+ "testTsc": "tsc --noEmit"
  },
  "dependencies": {
  "@sapphi-red/web-noise-suppressor": "0.3.3",
@@ -65,13 +66,14 @@
  "standalone-electron-types": "^1.0.0",
  "stylelint": "^15.6.0",
  "stylelint-config-standard": "^33.0.0",
+ "ts-patch": "^3.1.2",
  "tsx": "^3.12.7",
  "type-fest": "^3.9.0",
- "typescript": "^5.0.4",
- "zip-local": "^0.3.5",
- "zustand": "^3.7.2"
+ "typescript": "^5.4.5",
+ "typescript-transform-paths": "^3.4.7",
+ "zip-local": "^0.3.5"
  },
- "packageManager": "pnpm@8.10.2",
+ "packageManager": "pnpm@9.1.0",
  "pnpm": {
  "patchedDependencies": {
  "[email protected]": "patches/[email protected]",

packages/vencord-types/.gitignore

@@ -0,0 +1,7 @@
+*
+!.*ignore
+!package.json
+!*.md
+!prepare.ts
+!index.d.ts
+!globals.d.ts

packages/vencord-types/.npmignore

@@ -0,0 +1,4 @@
+node_modules
+prepare.ts
+.gitignore
+HOW2PUB.md

packages/vencord-types/HOW2PUB.md

@@ -0,0 +1,5 @@
+# How to publish
+
+1. run `pnpm generateTypes` in the project root
+2. bump package.json version
+3. npm publish

packages/vencord-types/README.md

@@ -0,0 +1,11 @@
+# Vencord Types
+
+Typings for Vencord's api, published to npm
+
+```sh
+npm i @vencord/types
+
+yarn add @vencord/types
+
+pnpm add @vencord/types
+```

packages/vencord-types/globals.d.ts

@@ -0,0 +1,24 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+declare global {
+ export var VencordNative: typeof import("./VencordNative").default;
+ export var Vencord: typeof import("./Vencord");
+}
+
+export { };

packages/vencord-types/index.d.ts

@@ -0,0 +1,5 @@
+/* eslint-disable */
+
+/// <reference path="Vencord.d.ts" />
+/// <reference path="globals.d.ts" />
+/// <reference path="modules.d.ts" />

packages/vencord-types/package.json

@@ -0,0 +1,28 @@
+{
+ "name": "@vencord/types",
+ "private": false,
+ "version": "0.1.3",
+ "description": "",
+ "types": "index.d.ts",
+ "scripts": {
+ "prepublishOnly": "tsx ./prepare.ts",
+ "test": "echo \"Error: no test specified\" && exit 1"
+ },
+ "keywords": [],
+ "author": "Vencord",
+ "license": "GPL-3.0",
+ "devDependencies": {
+ "@types/fs-extra": "^11.0.4",
+ "fs-extra": "^11.2.0",
+ "tsx": "^3.12.6"
+ },
+ "dependencies": {
+ "@types/lodash": "^4.14.191",
+ "@types/node": "^18.11.18",
+ "@types/react": "^18.2.0",
+ "@types/react-dom": "^18.0.10",
+ "discord-types": "^1.3.26",
+ "standalone-electron-types": "^1.0.0",
+ "type-fest": "^3.5.3"
+ }
+}

packages/vencord-types/prepare.ts

@@ -0,0 +1,47 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { cpSync, moveSync, readdirSync, rmSync } from "fs-extra";
+import { join } from "path";
+
+readdirSync(join(__dirname, "src"))
+ .forEach(child => moveSync(join(__dirname, "src", child), join(__dirname, child), { overwrite: true }));
+
+const VencordSrc = join(__dirname, "..", "..", "src");
+
+for (const file of ["preload.d.ts", "userplugins", "main", "debug", "src", "browser", "scripts"]) {
+ rmSync(join(__dirname, file), { recursive: true, force: true });
+}
+
+function copyDtsFiles(from: string, to: string) {
+ for (const file of readdirSync(from, { withFileTypes: true })) {
+ // bad
+ if (from === VencordSrc && file.name === "globals.d.ts") continue;
+
+ const fullFrom = join(from, file.name);
+ const fullTo = join(to, file.name);
+
+ if (file.isDirectory()) {
+ copyDtsFiles(fullFrom, fullTo);
+ } else if (file.name.endsWith(".d.ts")) {
+ cpSync(fullFrom, fullTo);
+ }
+ }
+}
+
+copyDtsFiles(VencordSrc, __dirname);