Skip to content

Commit

Permalink
Merge branch 'main' into context-menu-api-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
colin273 authored Jul 6, 2024
2 parents e9c279e + 70c530a commit e7f00d3
Show file tree
Hide file tree
Showing 32 changed files with 1,980 additions and 2,948 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/cspell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 21
node-version: 20

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4

- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
- uses: actions/cache@v4
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 21
node-version: 20

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4

- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
- uses: actions/cache@v4
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/prettier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 21
node-version: 20

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4

- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
- uses: actions/cache@v4
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 21
node-version: 20

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4

- name: Install Node.js dependencies
run: pnpm install
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/typescript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 21
node-version: 20

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4

- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
- uses: actions/cache@v4
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v21.7.3
v20.15.0
2 changes: 1 addition & 1 deletion bin/index.mts
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ const CONFIG_PATH = (() => {
return path.join(process.env.HOME || "", ".config", REPLUGGED_FOLDER_NAME);
}
})();
const CHROME_VERSION = "91";
const CHROME_VERSION = "124";

function buildAddons(buildFn: (args: Args) => Promise<void>, args: Args, type: AddonType): void {
const addons = getAddonFolder(type);
Expand Down
6 changes: 5 additions & 1 deletion cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"automod",
"autosize",
"blurple",
"channeltextarea",
"Chunkdiscord",
"codemirror",
"cooldown",
Expand Down Expand Up @@ -38,8 +39,10 @@
"marshift",
"metafile",
"Millis",
"nonmatching",
"notif",
"notrack",
"olavwolfiken",
"outfile",
"popout",
"Promisable",
Expand All @@ -62,7 +65,8 @@
"Vendicated",
"webauthn",
"weblate",
"Withs"
"Withs",
"YofukashiNo"
],
"ignoreWords": [],
"import": [],
Expand Down
88 changes: 40 additions & 48 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "replugged",
"version": "4.8.0",
"version": "4.8.1",
"description": "A lightweight @discord client mod focused on simplicity and performance",
"license": "MIT",
"main": "dist/main.mjs",
"types": "dist/renderer/replugged.d.ts",
"engines": {
"node": ">=21.0.0",
"node": ">=20.0.0",
"pnpm": ">=9.0.0"
},
"packageManager": "pnpm@9.0.6",
"packageManager": "pnpm@9.4.0",
"scripts": {
"build": "tsx scripts/build.mts",
"bundle": "tsx scripts/build.mts --production",
Expand Down Expand Up @@ -39,35 +39,34 @@
},
"devDependencies": {
"@marshift/argus": "^1.0.3",
"@types/adm-zip": "^0.5.3",
"@types/highlightjs": "^9.12.4",
"@types/lodash": "^4.14.200",
"@types/node": "^18.18.6",
"@types/prompts": "^2.4.7",
"@types/react": "^18.2.29",
"@types/react-dom": "^18.2.14",
"@types/react-reconciler": "^0.28.6",
"@types/semver": "^7.5.4",
"@types/superagent": "^4.1.20",
"@types/update-notifier": "^6.0.6",
"@types/ws": "^8.5.8",
"@types/yargs": "^17.0.29",
"@typescript-eslint/eslint-plugin": "^6.8.0",
"@typescript-eslint/parser": "^6.8.0",
"cspell": "^7.3.8",
"@types/adm-zip": "^0.5.5",
"@types/lodash": "^4.17.5",
"@types/node": "^20.14.8",
"@types/prompts": "^2.4.9",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"@types/react-reconciler": "^0.28.8",
"@types/semver": "^7.5.8",
"@types/superagent": "^8.1.7",
"@types/update-notifier": "^6.0.8",
"@types/ws": "^8.5.10",
"@types/yargs": "^17.0.32",
"@typescript-eslint/eslint-plugin": "^7.13.1",
"@typescript-eslint/parser": "^7.13.1",
"cspell": "^8.9.1",
"discord-types": "^1.3.3",
"eslint": "^8.51.0",
"eslint": "^8.57.0",
"eslint-config-dmitmel": "github:dmitmel/eslint-config-dmitmel",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-react": "^7.33.2",
"moment": "^2.29.4",
"np": "^8.0.4",
"prettier": "^3.0.3",
"highlight.js": "^11.9.0",
"moment": "^2.30.1",
"np": "^10.0.6",
"prettier": "^3.3.2",
"simple-markdown": "^0.7.3",
"style-mod": "^4.1.0",
"type-fest": "^4.5.0",
"typedoc": "^0.25.2",
"typescript": "^5.2.2"
"style-mod": "^4.1.2",
"type-fest": "^4.20.1",
"typedoc": "^0.26.0",
"typescript": "^5.4.5"
},
"files": [
"dist",
Expand All @@ -78,34 +77,27 @@
],
"dependencies": {
"@codemirror/lang-css": "^6.2.1",
"@codemirror/language": "^6.9.1",
"@codemirror/state": "^6.3.1",
"@ddietr/codemirror-themes": "^1.4.2",
"@electron/asar": "^3.2.7",
"@lezer/highlight": "^1.1.6",
"@octokit/rest": "^20.0.2",
"adm-zip": "^0.5.10",
"@codemirror/language": "^6.10.2",
"@codemirror/state": "^6.4.1",
"@electron/asar": "^3.2.10",
"@lezer/highlight": "^1.2.0",
"@octokit/rest": "^20.1.1",
"adm-zip": "^0.5.14",
"chalk": "^5.3.0",
"codemirror": "^6.0.1",
"esbuild": "^0.19.5",
"esbuild-sass-plugin": "^2.16.0",
"esm": "^3.2.25",
"esbuild": "^0.21.5",
"esbuild-sass-plugin": "^3.3.1",
"node-fetch": "^3.3.2",
"prompts": "^2.4.2",
"semver": "^7.5.4",
"semver": "^7.6.2",
"standalone-electron-types": "^1.0.0",
"tsx": "^4.6.2",
"update-notifier": "^6.0.2",
"ws": "^8.14.2",
"tsx": "^4.15.7",
"update-notifier": "^7.0.0",
"ws": "^8.17.1",
"yargs": "^17.7.2",
"zod": "^3.22.4"
"zod": "^3.23.8"
},
"bin": {
"replugged": "bin.mjs"
},
"pnpm": {
"overrides": {
"semver@<7.5.2": ">=7.5.2"
}
}
}
Loading

0 comments on commit e7f00d3

Please sign in to comment.