Skip to content

Commit

Permalink
Develop changes (#15)
Browse files Browse the repository at this point in the history
* bump prisma 🎉

* save progress
  • Loading branch information
aaronleopold authored May 26, 2022
1 parent da95f2a commit 3e345c0
Show file tree
Hide file tree
Showing 16 changed files with 252 additions and 74 deletions.
6 changes: 5 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# ignore markdown files, there's just gonna be so many of them lol
*.md linguist-detectable=false
*.md linguist-detectable=false
*.sql linguist-detectable=false

# I don't want website to be included in language stats
packages/website/* linguist-vendored
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ target

_next

docker-compose.yaml
docker-compose.yaml
openapi-example*
125 changes: 104 additions & 21 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"build:move-rocket": "trash ../../target/release/Rocket.toml && cp ./server/Rocket.toml ../../target/release/Rocket.toml",
"build:docker": "docker build -t stump .",
"server:start": "cd server && ROCKET_PROFILE=debug cargo run",
"server:dev": "cd server && ROCKET_PROFILE=debug cargo watch -x run",
"server:dev": "cd server && cargo watch -x run",
"server:build": "cd server && ROCKET_PROFILE=release cargo build --release",
"server:check": "cargo check",
"server:fmt": "cargo fmt --all --manifest-path=server/Cargo.toml",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"
default-run = "stump"

[dependencies]
prisma-client-rust = { git = "https://github.com/Brendonovich/prisma-client-rust", tag = "0.4.1" }
prisma-client-rust = { git = "https://github.com/Brendonovich/prisma-client-rust", tag = "0.5.0" }
serde = { version = "1.0", features = ["derive"] }
dotenv = "0.15.0"
# env_logger = "0.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/server/prisma-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ version = "0.1.0"
edition = "2021"

[dependencies]
prisma-client-rust-cli = { git = "https://github.com/Brendonovich/prisma-client-rust", tag = "0.4.1" }
prisma-client-rust-cli = { git = "https://github.com/Brendonovich/prisma-client-rust", tag = "0.5.0" }
Loading

1 comment on commit 3e345c0

@vercel
Copy link

@vercel vercel bot commented on 3e345c0 May 26, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.