Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: spam protection settings in /setup command #247

Merged
merged 9 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bun-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.26
1.1.30
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22.4.1
22.9.0
22 changes: 21 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,5 +123,25 @@
"typescript.inlayHints.variableTypes.enabled": true,
"typescript.inlayHints.propertyDeclarationTypes.enabled": true,
"typescript.inlayHints.variableTypes.suppressWhenTypeMatchesName": true,
"todo-tree.tree.showBadges": true
"todo-tree.tree.showBadges": true,
"files.exclude": {
"**/tmp/**": true,
"**/node_modules/**": true,
"**/.git/objects/**": true
},
"files.watcherExclude": {
"**/.git/objects/**": true,
"**/.git/subtree-cache/**": true,
"**/node_modules/**": true,
"**/tmp/**": true,
"**/dist/**": true
},
"search.exclude": {
"**/node_modules/**": true,
"**/dist/**": true,
"**/tmp/**": true,
"**/.git/objects/**": true,
"**/.git/subtree-cache/**": true
},
"search.followSymlinks": false
}
6 changes: 3 additions & 3 deletions blaze/wrapper/blaze_wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
node.version=22.4.1
bun.version=1.1.26
node.version=22.9.0
bun.version=1.1.30
blaze.srcpath=blazebuild
blaze.version=1.0.0-beta.1
blaze.version=1.0.0-beta.2
1 change: 1 addition & 0 deletions blazebuild/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ pids
_.pid
_.seed
*.pid.lock
/bun.lockb

# Directory for instrumented libs generated by jscoverage/JSCover

Expand Down
Binary file removed blazebuild/bun.lockb
Binary file not shown.
5 changes: 0 additions & 5 deletions build_src/src/main/typescript/tasks/CompileTask.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
files,
type Awaitable
} from "blazebuild";
import { $ } from "bun";
import path from "path";

@Task({
Expand All @@ -24,10 +23,6 @@ class CompileTask extends AbstractTask {
if (!buildOutputDirectory) {
throw new Error("buildOutputDirectory is not defined in project properties");
}

await $`mv ${buildOutputDirectory}/out/src ${buildOutputDirectory}/out.tmp`;
await $`rm -rf ${buildOutputDirectory}/out`;
await $`mv ${buildOutputDirectory}/out.tmp ${buildOutputDirectory}/out`;
}

@TaskDependencyGenerator
Expand Down
11 changes: 11 additions & 0 deletions build_src/src/main/typescript/tasks/CompileTypeScriptTask.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,17 @@ class CompileTypeScriptTask extends AbstractTask {
protected override async run(): Promise<void> {
IO.newline();
await $`bun x tsc`;

const buildOutputDirectory =
this.blaze.projectManager.properties.structure?.buildOutputDirectory;

if (!buildOutputDirectory) {
throw new Error("buildOutputDirectory is not defined in project properties");
}

await $`mv ${buildOutputDirectory}/out/src ${buildOutputDirectory}/out.tmp`;
await $`rm -rf ${buildOutputDirectory}/out`;
await $`mv ${buildOutputDirectory}/out.tmp ${buildOutputDirectory}/out`;
}

@TaskInputGenerator
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"discord.js": "^14.16.3",
"dot-object": "^2.1.5",
"dotenv": "^16.4.5",
"drizzle-orm": "^0.32.1",
"drizzle-orm": "^0.34.1",
"express": "^4.19.2",
"express-rate-limit": "^7.3.1",
"figlet": "^1.7.0",
Expand All @@ -104,14 +104,14 @@
"devDependencies": {
"@commitlint/cli": "^19.3.0",
"@commitlint/config-conventional": "^19.2.2",
"@faker-js/faker": "^8.4.1",
"@faker-js/faker": "^9.0.3",
"@onesoftnet/pm2-config": "^0.0.7",
"@types/archiver": "^6.0.2",
"@types/bcrypt": "^5.0.2",
"@types/bun": "latest",
"@types/cors": "^2.8.17",
"@types/dot-object": "^2.1.6",
"@types/express": "^4.17.21",
"@types/express": "^5.0.0",
"@types/figlet": "^1.5.8",
"@types/glob": "^8.1.0",
"@types/jsonwebtoken": "^9.0.6",
Expand All @@ -123,7 +123,7 @@
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"@vitest/coverage-v8": "^1.6.0",
"@vitest/coverage-v8": "^2.1.2",
"eslint": "^8.57.0",
"husky": "^9.1.3",
"prettier": "^3.3.3",
Expand All @@ -132,7 +132,7 @@
"typedoc-plugin-rename-defaults": "^0.7.1",
"typescript": "^5.5.3",
"typescript-eslint": "^7.16.1",
"vitest": "^1.6.0",
"vitest": "^2.1.2",
"zod-to-json-schema": "^3.23.1"
}
}
Loading
Loading