-
Notifications
You must be signed in to change notification settings - Fork 133
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into nex-fake-mass-ammo
- Loading branch information
Showing
47 changed files
with
6,504 additions
and
6,672 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,58 @@ | ||
| { | ||
| "scripts": { | ||
| "============DEVELOPMENT": "============", | ||
| "watch": "nodemon --delay 1ms -e ts -w src --exec 'yarn buildandrun'", | ||
| "dev:stage1": "yarn concurrent \"yarn\" \"yarn wipedist\" \"prisma db push\" \"yarn generate:robochimp\"", | ||
| "dev:stage2": "yarn concurrent \"yarn build:tsc\"", | ||
| "dev:stage3": "yarn concurrent \"yarn commands\" \"yarn creatables\" \"yarn wiki\"", | ||
| "dev:stage4": "yarn lint && yarn test", | ||
| "dev": "yarn dev:stage1 && yarn dev:stage2 && yarn dev:stage3 && yarn dev:stage4", | ||
| "watch:tsc": "tsc -w -p src", | ||
| "buildandrun": "yarn build:esbuild && node --enable-source-maps dist", | ||
| "start": "echo 'yarn start is now the same as yarn watch' && yarn watch", | ||
| "============SCRIPTS": "============", | ||
| "spritesheet": "tsx ./scripts/spritesheet.ts && yarn lint:biome", | ||
| "data": "concurrently \"tsx ./scripts/monster_table.ts\" && yarn lint", | ||
| "wiki": "tsx ./scripts/wiki.ts", | ||
| "commands": "tsx ./scripts/renderCommandsFile.ts", | ||
| "creatables": "tsx ./scripts/renderCreatablesFile.ts", | ||
| "generate:robochimp": "prisma generate --no-hints --schema prisma/robochimp.prisma", | ||
| "============BUILDING": "============", | ||
| "build": "tsx ./scripts/build.ts", | ||
| "start": "yarn build && node --enable-source-maps dist/", | ||
| "gen": "concurrently --raw \"prisma generate --no-hints\" \"prisma generate --no-hints --schema prisma/robochimp.prisma\" && echo \"Generated Prisma Client\"", | ||
| "prettify": "prettier --use-tabs \"./**/*.{md,yml}\" --write --log-level silent", | ||
| "gen": "concurrently --raw \"prisma generate --no-hints\" \"yarn generate:robochimp\" && echo \"Generated Prisma Client\"", | ||
| "build:tsc": "tsc -p src", | ||
| "watch:tsc": "tsc -w -p src", | ||
| "build:esbuild": "concurrently --raw \"yarn build:main\" \"yarn build:workers\"", | ||
| "build:main": "esbuild src/index.ts src/lib/workers/index.ts --sourcemap=inline --minify --legal-comments=none --outdir=./dist --log-level=error --bundle --platform=node --loader:.node=file --external:skia-canvas --external:@prisma/robochimp --external:@prisma/client --external:zlib-sync --external:bufferutil --external:oldschooljs --external:discord.js --external:node-fetch --external:piscina", | ||
| "build:workers": "esbuild src/lib/workers/kill.worker.ts src/lib/workers/finish.worker.ts src/lib/workers/casket.worker.ts --sourcemap=inline --log-level=error --bundle --minify --legal-comments=none --outdir=./dist/lib/workers --platform=node --loader:.node=file --external:skia-canvas --external:@prisma/robochimp --external:@prisma/client --external:zlib-sync --external:bufferutil --external:oldschooljs --external:discord.js --external:node-fetch --external:piscina", | ||
| "============TESTING": "============", | ||
| "test": "yarn concurrent \"yarn test:circular\" \"yarn test:lint\" \"yarn test:unit\" \"yarn test:typecheck\"", | ||
| "test:typecheck": "concurrently \"tsc -p tests/unit\" \"tsc -p tests/integration\"", | ||
| "wipedist": "node -e \"try { require('fs').rmSync('dist', { recursive: true }) } catch(_){}\"", | ||
| "dev": "concurrently --raw --kill-others-on-fail \"yarn\" \"yarn wipedist\" \"yarn lint\" && concurrently \"yarn build\" \"yarn wiki\" && yarn test", | ||
| "test": "concurrently --raw --kill-others-on-fail \"tsc -p src && yarn test:circular\" \"yarn test:lint\" \"yarn test:unit\" \"yarn test:typecheck\"", | ||
| "test:circular": "dpdm --exit-code circular:1 --progress=false --warning=false --tree=false ./dist/index.js", | ||
| "test:lint": "biome check --diagnostic-level=error", | ||
| "test:unit": "vitest run --config vitest.unit.config.mts", | ||
| "test:docker": "docker compose up --no-attach db --no-attach redis --build --abort-on-container-exit && docker compose down -v", | ||
| "test:watch": "vitest --config vitest.unit.config.mts --coverage", | ||
| "buildandrun": "yarn build:esbuild && node --enable-source-maps dist", | ||
| "build:esbuild": "concurrently --raw \"yarn build:main\" \"yarn build:workers\"", | ||
| "build:main": "esbuild src/index.ts src/lib/workers/index.ts --sourcemap=inline --minify --legal-comments=none --outdir=./dist --log-level=error --bundle --platform=node --loader:.node=file --external:skia-canvas --external:@prisma/robochimp --external:@prisma/client --external:zlib-sync --external:bufferutil --external:oldschooljs --external:discord.js --external:node-fetch --external:piscina", | ||
| "build:workers": "esbuild src/lib/workers/kill.worker.ts src/lib/workers/finish.worker.ts src/lib/workers/casket.worker.ts --sourcemap=inline --log-level=error --bundle --minify --legal-comments=none --outdir=./dist/lib/workers --platform=node --loader:.node=file --external:skia-canvas --external:@prisma/robochimp --external:@prisma/client --external:zlib-sync --external:bufferutil --external:oldschooljs --external:discord.js --external:node-fetch --external:piscina", | ||
| "test:circular": "dpdm --exit-code circular:1 --progress=false --warning=false --tree=false ./dist/index.js", | ||
| "test:ci:unit": "concurrently --raw --kill-others-on-fail \"yarn test:unit\" \"yarn test:lint\" \"tsc -p tests/integration\" \"tsc -p tests/unit\" \"yarn build:tsc && yarn test:circular\"", | ||
| "spritesheet": "tsx ./scripts/spritesheet.ts && yarn lint:biome", | ||
| "data": "concurrently \"tsx ./scripts/monster_table.ts\" && yarn lint", | ||
| "wiki": "tsx ./scripts/wiki.ts", | ||
| "test:ci:unit": "yarn concurrent \"yarn test:unit\" \"yarn test:lint\" \"tsc -p tests/integration\" \"tsc -p tests/unit\" \"yarn build:tsc && yarn test:circular\"", | ||
| "============LINTING": "============", | ||
| "lint:biome": "biome check --write --unsafe --diagnostic-level=error", | ||
| "lint": "concurrently --raw --kill-others-on-fail \"yarn lint:biome\" \"yarn prettify\" \"prisma format --schema ./prisma/robochimp.prisma\" \"prisma format --schema ./prisma/schema.prisma\"" | ||
| "lint:prettier": "prettier --use-tabs \"./**/*.{md,yml}\" --write --log-level silent", | ||
| "lint:prisma": "yarn concurrent \"prisma format --schema ./prisma/robochimp.prisma\" \"prisma format --schema ./prisma/schema.prisma\"", | ||
| "lint": "yarn concurrent \"yarn lint:biome\" \"yarn lint:prettier\" \"yarn lint:prisma\"", | ||
| "============MISC": "============", | ||
| "wipedist": "node -e \"try { require('fs').rmSync('dist', { recursive: true }) } catch(_){}\"", | ||
| "concurrent": "concurrently --raw --kill-others-on-fail" | ||
| }, | ||
| "dependencies": { | ||
| "@oldschoolgg/toolkit": "git+https://github.com/oldschoolgg/toolkit.git#8686dc639154c528ce739c440554bc0c46c8ae79", | ||
| "@prisma/client": "^5.17.0", | ||
| "@prisma/client": "^5.20.0", | ||
| "@sapphire/ratelimits": "^2.4.9", | ||
| "@sapphire/snowflake": "^3.5.3", | ||
| "@sapphire/time-utilities": "^1.6.0", | ||
| "@sapphire/timer-manager": "^1.0.2", | ||
| "@sentry/node": "^8.15.0", | ||
| "@sentry/node": "^8.34.0", | ||
| "ascii-table3": "^0.9.0", | ||
| "bufferutil": "^4.0.8", | ||
| "discord.js": "^14.16.2", | ||
| "discord.js": "^14.16.3", | ||
| "dotenv": "^16.4.5", | ||
| "e": "0.2.33", | ||
| "exit-hook": "^4.0.0", | ||
|
|
@@ -48,36 +62,36 @@ | |
| "murmurhash": "^2.0.1", | ||
| "node-cron": "^3.0.3", | ||
| "node-fetch": "^2.6.7", | ||
| "oldschooljs": "git+https://github.com/oldschoolgg/oldschooljs.git#50fff6e124d20f8118bcc09dad385046119a9175", | ||
| "oldschooljs": "git+https://github.com/oldschoolgg/oldschooljs.git#4056e639e7007226015d1380dd2312692bbfa8c3", | ||
| "p-queue": "^6.6.2", | ||
| "piscina": "^4.6.1", | ||
| "piscina": "^4.7.0", | ||
| "postgres": "^3.4.4", | ||
| "random-js": "^2.1.0", | ||
| "remeda": "^2.7.0", | ||
| "remeda": "^2.15.0", | ||
| "simple-statistics": "^7.8.3", | ||
| "skia-canvas": "^1.0.2", | ||
| "sonic-boom": "^4.0.1", | ||
| "sonic-boom": "^4.1.0", | ||
| "zlib-sync": "^0.1.9", | ||
| "zod": "^3.23.8" | ||
| }, | ||
| "devDependencies": { | ||
| "@biomejs/biome": "^1.8.3", | ||
| "@biomejs/biome": "^1.9.3", | ||
| "@types/lodash": "^4.14.195", | ||
| "@types/node": "^20.14.9", | ||
| "@types/node-cron": "^3.0.7", | ||
| "@types/node-fetch": "^2.6.1", | ||
| "@vitest/coverage-v8": "^2.1.2", | ||
| "concurrently": "^8.2.2", | ||
| "dpdm": "^3.14.0", | ||
| "esbuild": "0.21.5", | ||
| "esbuild": "0.24.0", | ||
| "fast-glob": "^3.3.2", | ||
| "google-auth-library": "^9.14.1", | ||
| "google-spreadsheet": "^4.1.4", | ||
| "nodemon": "^3.1.4", | ||
| "prettier": "^3.3.2", | ||
| "prisma": "^5.17.0", | ||
| "nodemon": "^3.1.7", | ||
| "prettier": "^3.3.3", | ||
| "prisma": "^5.20.0", | ||
| "spritesmith": "^3.4.1", | ||
| "tsx": "^4.16.2", | ||
| "tsx": "^4.19.1", | ||
| "typescript": "^5.5.3", | ||
| "vitest": "^2.1.2" | ||
| }, | ||
|
|
@@ -86,6 +100,6 @@ | |
| }, | ||
| "packageManager": "[email protected]", | ||
| "resolutions": { | ||
| "esbuild": "0.21.5" | ||
| "esbuild": "0.24.0" | ||
| } | ||
| } | ||
Oops, something went wrong.