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

Wrapper: Make codeResources and useDiffEditor optional in EditorAppConfig #670

Merged
merged 5 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
7 changes: 5 additions & 2 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ module.exports = {
],
parserOptions: {
ecmaVersion: 2022,
sourceType: 'module'
sourceType: 'module',
project: ['./tsconfig.json']
},
plugins: [
'@typescript-eslint',
Expand Down Expand Up @@ -80,6 +81,8 @@ module.exports = {
'@typescript-eslint/prefer-for-of': 'error', // prefer for-of loop over arrays
'@typescript-eslint/prefer-namespace-keyword': 'error', // prefer namespace over module in TypeScript
'@typescript-eslint/triple-slash-reference': 'error', // ban /// <reference />, prefer imports
'@typescript-eslint/type-annotation-spacing': 'error' // consistent space around colon ':'
'@typescript-eslint/type-annotation-spacing': 'error', // consistent space around colon ':'
'@typescript-eslint/strict-boolean-expressions': 'error', // Disallow certain types in boolean expressions
'@typescript-eslint/no-unnecessary-condition': 'error' // Disallow conditionals where the type is always truthy or always falsy
}
};
156 changes: 78 additions & 78 deletions package-lock.json

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

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"@codingame/esbuild-import-meta-url-plugin": "~1.0.2",
"@codingame/monaco-vscode-rollup-vsix-plugin": "~5.2.0",
"@rollup/pluginutils": "~5.1.0",
"@types/node": "~20.14.0",
"@types/node": "~20.14.1",
"@types/react": "~18.3.3",
"@types/react-dom": "~18.3.0",
"@types/vscode": "~1.89.0",
"@typescript-eslint/eslint-plugin": "~7.11.0",
"@typescript-eslint/parser": "~7.11.0",
"@typescript-eslint/eslint-plugin": "~7.12.0",
"@typescript-eslint/parser": "~7.12.0",
"@vitest/browser": "~1.6.0",
"editorconfig": "~2.0.0",
"esbuild": "~0.21.4",
Expand All @@ -24,7 +24,7 @@
"vite": "~5.2.12",
"vitest": "~1.6.0",
"vite-node": "~1.6.0",
"webdriverio": "~8.38.0"
"webdriverio": "~8.38.2"
},
"volta": {
"node": "20.14.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class MonacoLanguageClient extends BaseLanguageClient {
protected readonly connectionProvider: IConnectionProvider;

constructor({ id, name, clientOptions, connectionProvider }: MonacoLanguageClientOptions) {
super(id || name.toLowerCase(), name, clientOptions);
super((id ?? 'unknown-id') || name.toLowerCase(), name, clientOptions);
kaisalmen marked this conversation as resolved.
Show resolved Hide resolved
this.connectionProvider = connectionProvider;
}

Expand Down
Loading
Loading