Skip to content

Commit

Permalink
Merge branch 'master' into feat_versioning_scheme
Browse files Browse the repository at this point in the history
  • Loading branch information
Divyendu Singh committed May 4, 2020
2 parents 003f072 + 2237b57 commit b59c10b
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion client/package-lock.json

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

2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "prisma-lsp-client",
"description": "Implementation of a language server.",
"version": "0.0.38",
"version": "0.0.39",
"author": "Prisma",
"license": "Apache-2.0",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "prisma-dev",
"displayName": "Prisma Dev",
"description": "Adds syntax highlighting, formatting, auto-completion, jump-to-definition and linting for .prisma files.",
"version": "0.0.38",
"version": "0.0.39",
"license": "Apache-2.0",
"icon": "logo_white.png",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion scripts/prisma_version_unstable
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0-alpha.1180
2.0.0-alpha.1181
46 changes: 23 additions & 23 deletions server/package-lock.json

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

10 changes: 5 additions & 5 deletions server/package.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"name": "prisma-lsp-server",
"description": "Implementation of a language server in node.",
"version": "0.0.38",
"version": "0.0.39",
"author": "Prisma",
"license": "Apache-2.0",
"engines": {
"node": ">=10"
},
"prisma": {
"version": "afb12ae1d317dedf2417fdd85581868c75508d13"
"version": "052a692dc18f79e7b60004a3b29f8a15d53e5f3c"
},
"repository": {
"type": "github",
"url": "https://github.com/prisma/vscode"
},
"dependencies": {
"@prisma/fetch-engine": "2.0.0-alpha.1180",
"@prisma/get-platform": "2.0.0-alpha.1180",
"@prisma/sdk": "2.0.0-alpha.1180",
"@prisma/fetch-engine": "2.0.0-alpha.1181",
"@prisma/get-platform": "2.0.0-alpha.1181",
"@prisma/sdk": "2.0.0-alpha.1181",
"pkg-dir": "4.2.0",
"vscode-languageserver": "6.1.1",
"vscode-languageserver-textdocument": "1.0.1",
Expand Down

0 comments on commit b59c10b

Please sign in to comment.