Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
gc committed Nov 23, 2024
1 parent fb3792b commit 555b0b6
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"scripts": {
"============DEVELOPMENT": "============",
"watch": "nodemon --delay 1ms -e ts -w src --exec \"pnpm build && node --enable-source-maps dist\"",
"dev:stage1": "pnpm concurrent \"pnpm install\" \"pnpm wipedist\" \"prisma db push\" \"pnpm generate:robochimp\"",
"dev:stage1": "pnpm concurrent \"pnpm install\" \"prisma db push\" \"pnpm generate:robochimp\"",
"dev:stage2": "pnpm concurrent \"pnpm commands\" \"pnpm creatables\" \"pnpm wiki\" \"pnpm build\"",
"dev:stage3": "pnpm lint && pnpm test",
"dev": "pnpm dev:stage1 && pnpm dev:stage2 && pnpm dev:stage3",
Expand All @@ -19,7 +19,7 @@
"creatables": "tsx ./scripts/renderCreatablesFile.ts",
"generate:robochimp": "prisma generate --no-hints --schema prisma/robochimp.prisma",
"============BUILDING": "============",
"build": "pnpm build:packages && pnpm build:esbuild",
"build": "pnpm --stream -r build:esbuild && pnpm build:esbuild",
"gen": "concurrently --raw \"prisma generate --no-hints\" \"pnpm generate:robochimp\" && echo \"Generated Prisma Client\"",
"build:esbuild": "concurrently --raw \"pnpm build:main\" \"pnpm 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",
Expand All @@ -33,21 +33,19 @@
"test:watch": "vitest --config vitest.unit.config.mts --coverage",
"test:ci:unit": "pnpm concurrent \"pnpm test:unit\" \"pnpm test:lint\" \"tsc -p tests/integration\" \"tsc -p tests/unit\"",
"============LINTING": "============",
"lint:biome": "git diff --name-only HEAD | xargs biome check --write --unsafe --diagnostic-level=error",
"lint:biome": "git diff --name-only --diff-filter=d HEAD | xargs biome check --write --unsafe --diagnostic-level=error",
"lint:prettier": "prettier --use-tabs \"./**/*.{md,yml}\" --write --log-level silent",
"lint:prisma": "pnpm concurrent \"prisma format --schema ./prisma/robochimp.prisma\" \"prisma format --schema ./prisma/schema.prisma\"",
"lint": "pnpm concurrent \"pnpm lint:biome\" \"pnpm lint:prettier\"",
"============MISC": "============",
"wipedist": "node -e \"try { require('fs').rmSync('dist', { recursive: true }) } catch(_){}\"",
"concurrent": "concurrently --raw --kill-others-on-fail",
"build:packages": "pnpm --stream -r build",
"build:packages": "concurrently --raw \"pnpm --stream -r build:esbuild\" \"pnpm --stream -r build:types\"",
"============monorepo": "============",
"monorepo:build": "pnpm concurrent \"pnpm build:packages\" \"pnpm gen\" && pnpm build",
"monorepo:build": "pnpm concurrent \"pnpm build:packages\" \"pnpm gen\" && pnpm build:esbuild",
"monorepo:test": "pnpm concurrent \"pnpm --stream -r test\" \"pnpm test\""
},
"dependencies": {
"@oldschoolgg/toolkit": "workspace:*",
"oldschooljs": "workspace:*",
"@prisma/client": "^5.20.0",
"@sapphire/ratelimits": "^2.4.9",
"@sapphire/snowflake": "^3.5.3",
Expand All @@ -66,6 +64,7 @@
"murmurhash": "^2.0.1",
"node-cron": "^3.0.3",
"node-fetch": "^2.6.7",
"oldschooljs": "workspace:*",
"p-queue": "^6.6.2",
"piscina": "^4.7.0",
"postgres": "^3.4.4",
Expand Down
6 changes: 3 additions & 3 deletions packages/oldschooljs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
"url": "git+https://github.com/oldschoolgg/oldschooljs.git"
},
"scripts": {
"wipedist": "node -e \"try { require('fs').rmSync('dist', { recursive: true }) } catch(_){}\"",
"test": "concurrently \"pnpm test:unit\" \"tsc --noEmit -p test\" \"tsc --noEmit -p src\"",
"test:unit": "vitest run --coverage",
"build": "node esbuild.cjs",
"preparexx": "tsx scripts/prepare",
"dev": "pnpm prepare && pnpm build && pnpm test"
"dev": "pnpm prepare && pnpm build && pnpm test",
"build:esbuild": "node esbuild.cjs",
"build:types": "tsc -p src"
},
"dependencies": {
"deepmerge": "4.3.1"
Expand Down
File renamed without changes.
5 changes: 3 additions & 2 deletions packages/toolkit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
}
},
"scripts": {
"build": "node esbuild.js",
"test": "concurrently \"tsc -p src\" \"pnpm vitest run\" \"tsc -p tests\""
"test": "concurrently \"tsc -p src\" \"pnpm vitest run\" \"tsc -p tests\"",
"build:esbuild": "node esbuild.cjs",
"build:types": "tsc -p src"
},
"dependencies": {
"decimal.js": "^10.4.3",
Expand Down

0 comments on commit 555b0b6

Please sign in to comment.