Skip to content

Commit

Permalink
Merge branch 'master' into fixclues
Browse files Browse the repository at this point in the history
  • Loading branch information
DayV-git authored Nov 25, 2024
2 parents 408f4d1 + 5a45bc7 commit 26672a1
Show file tree
Hide file tree
Showing 85 changed files with 4,523 additions and 2,865 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
timeout-minutes: 5
strategy:
matrix:
node_version: [20.15.0]
node_version: [20.18.1]
os: [ubuntu-latest]
concurrency:
group: ${{ github.ref_name }}-unittests
Expand All @@ -37,11 +37,11 @@ jobs:
with:
path: node_modules
key: ${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/pnpm-lock.yaml') }}
- name: Install Dependencies
run: pnpm install --shamefully-hoist --frozen-lockfile
- name: Copy Configuration
run: |
cp .env.test .env
- name: Install Dependencies
run: pnpm install
- name: Build
run: pnpm monorepo:build
- name: Test
Expand Down
12 changes: 0 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
# Klasa
*.log
/config/private.js
/config/private.json
private.json
trivia-questions.json
dist/
bwd/
icon_cache/
.env
queries.txt
/logs

.yarn
Expand All @@ -27,16 +22,11 @@ node_modules/
# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

/coverage
*.cpuprofile

cache.json

tests/**/*.tsbuildinfo

.pnp.*
.yarn/*
!.yarn/patches
Expand All @@ -48,10 +38,8 @@ item/

tmp


robochimp
wiki.xml

.pnpm-store
*.tsbuildinfo
*/coverage
4 changes: 4 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
shamefully-hoist=true
hoist=true
link-workspace-packages=true
include-workspace-root=true
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ dist
coverage
node_modules
logs
licenses
licenses
pnpm-lock.yaml
2 changes: 2 additions & 0 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
"include": ["**/*.ts", "**/*.mts", "**/*.json", "**/*.test.ts", "**/*.mdx", "**/*.md", "**/*.mjs", "**/*.cjs"]
},
"vcs": {
"enabled": true,
"clientKind": "git",
"defaultBranch": "master"
},
"linter": {
Expand Down
2 changes: 1 addition & 1 deletion dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ENTRYPOINT ["dumb-init", "--"]
FROM base AS dependencies
WORKDIR /usr/src/app

COPY package.json pnpm-workspace.yaml pnpm-lock.yaml ./
COPY package.json pnpm-workspace.yaml pnpm-lock.yaml .npmrc ./
COPY .env.test .env

RUN pnpm install --frozen-lockfile
Expand Down
3 changes: 2 additions & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"unist-util-visit-parents": "^6.0.1"
},
"devDependencies": {
"@types/markdown-it": "^14"
"@types/markdown-it": "^14",
"typescript": "^5.5.3"
}
}
Binary file added docs/public/images/phosani-bis.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/public/images/toamaxgear.webp
Binary file not shown.
Binary file added docs/public/images/tobmaxgear.webp
Binary file not shown.
6 changes: 3 additions & 3 deletions docs/src/content/docs/bso/Monsters/Raids/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ title: "Raids"

The OSB Wiki has most of the information on each raid, the purpose of this space is to highlight the BSO specific differences.

[OSB Chambers of Xeric (CoX)](https://wiki.oldschool.gg/raids/cox-raids)
[OSB Chambers of Xeric (CoX)](https://wiki.oldschool.gg/osb/raids/cox)

[OSB Theatre of Blood (ToB)](https://wiki.oldschool.gg/raids/theatre-of-blood)
[OSB Theatre of Blood (ToB)](https://wiki.oldschool.gg/osb/raids/tob)

[OSB Tombs of Amascut (ToA)](https://wiki.oldschool.gg/raids/tombs-of-amascut-toa)
[OSB Tombs of Amascut (ToA)](https://wiki.oldschool.gg/osb/raids/toa)

## How does 'BiS gear' work?

Expand Down
4 changes: 2 additions & 2 deletions docs/src/content/docs/bso/Monsters/Raids/chambers-of-xeric.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "Chambers of Xeric (CoX)"
---

See the [OSB wiki](https://wiki.oldschool.gg/minigames/cox-raids) for general info.
See the [OSB wiki](https://wiki.oldschool.gg/osb/raids/cox/) for general info.

### Boosts

Expand Down Expand Up @@ -33,7 +33,7 @@ All boosts work from the bank unless otherwise specified. Gorajan armour does no

### Reference Setups

See [How does 'BiS gear' work?](./#how-does-bis-gear-work) for an explanation on gear setups.
See [How does 'BiS gear' work?](https://wiki.oldschool.gg/bso/monsters/raids/readme/#how-does-bis-gear-work) for an explanation on gear setups.

<figure><figcaption>Mage</figcaption></figure>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "Theatre of Blood (ToB)"
---

See the [OSB wiki](https://wiki.oldschool.gg/raids/theatre-of-blood) for general info.
See the [OSB wiki](https://wiki.oldschool.gg/osb/raids/tob) for general info.

## Boosts

Expand Down Expand Up @@ -41,7 +41,7 @@ See the [OSB wiki](https://wiki.oldschool.gg/raids/theatre-of-blood) for general

## Reference Setups

See [How does 'BiS gear' work?](./#how-does-bis-gear-work) for an explanation on gear setups.
See [How does 'BiS gear' work?](https://wiki.oldschool.gg/bso/monsters/raids/readme/#how-does-bis-gear-work) for an explanation on gear setups.

<figure><figcaption>Melee - not bis</figcaption></figure>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "Tombs of Amascut (ToA)"
---

See the [OSB wiki ](https://wiki.oldschool.gg/raids/tombs-of-amascut-toa)for general info.
See the [OSB wiki ](https://wiki.oldschool.gg/osb/raids/toa)for general info.

## Boosts

Expand All @@ -18,7 +18,7 @@ Boosts are different in BSO to the OSB version, they are as followed:

## Reference Setups

See [How does 'BiS gear' work?](./#how-does-bis-gear-work) for an explanation on gear setups.
See [How does 'BiS gear' work?](https://wiki.oldschool.gg/bso/monsters/raids/readme/#how-does-bis-gear-work) for an explanation on gear setups.

### Melee

Expand Down
Loading

0 comments on commit 26672a1

Please sign in to comment.