Skip to content
This repository has been archived by the owner on May 7, 2024. It is now read-only.

Jlgtechnology/issue352/grammarly login issue #358

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion extension/src/GrammarlyClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export class GrammarlyClient implements Registerable {
window.registerUriHandler({
handleUri: async (uri) => {
const url = new URL(uri.toString(true))
if (url.path === '/auth/callback') {
if (url.pathname === '/auth/callback') {
try {
url.searchParams.delete('state') // added by github.dev
await this.client.protocol.handleOAuthCallbackUri(url.toString())
Expand Down
2 changes: 1 addition & 1 deletion extension/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"target": "ES2019",
"moduleResolution": "node",

"lib": ["ES2019"],
"lib": ["ES2019", "dom"],
"sourceMap": true,
"strict": true,
"experimentalDecorators": true,
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"@rollup/plugin-replace": "^4.0.0",
"@rollup/plugin-typescript": "^8.3.2",
"@types/jest": "^27.5.0",
"@types/node": "^18.15.11",
"@vscode/test-web": "^0.0.24",
"@vuedx/monorepo-tools": "^0.2.2-next-1651055813.0",
"esbuild": "^0.14.38",
Expand Down
2 changes: 1 addition & 1 deletion packages/grammarly-languageclient/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@
"vscode-languageclient": "^7.0.0"
},
"devDependencies": {
"@grammarly/sdk": "^1.7.4"
"@grammarly/sdk": "^2.3.14"
}
}
2 changes: 1 addition & 1 deletion packages/grammarly-languageserver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"bin"
],
"dependencies": {
"@grammarly/sdk": "^1.7.4",
"@grammarly/sdk": "^2.3.14",
"grammarly-richtext-encoder": "workspace:*",
"htmlparser2": "^8.0.1",
"idb-keyval": "^6.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { CONNECTION } from '../constants'
import { Registerable } from '../interfaces/Registerable'
import { EditorConfig } from '@grammarly/sdk'

type DocumentConfig = Pick<EditorConfig, 'documentDialect' | 'documentDomain' | 'suggestions'>
type DocumentConfig = Pick<EditorConfig, 'documentDialect' | 'documentDomain' | 'suggestionCategories'>

@injectable()
export class ConfigurationService implements Registerable {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ export class DocumentService implements Registerable {
{ ops: [] },
{
...options,
onPluginError: (error) => {
connection.console.error('Error: ' + error.message)
},
},
)
})
Expand Down
2 changes: 1 addition & 1 deletion packages/grammarly-richtext-encoder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"web-tree-sitter": "0.20.5"
},
"devDependencies": {
"@grammarly/sdk": "^1.7.4",
"@grammarly/sdk": "^2.3.14",
"@types/jest": "^27.5.0",
"jest": "^28.1.0",
"ts-jest": "^28.0.2"
Expand Down