Skip to content

fix: monaco-graphql worker issue, es module config should use esNext #1979

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.

Sign up for GitHub

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

Merged
acao merged 4 commits into from
Oct 29, 2021
Merged

fix: monaco-graphql worker issue, es module config should use esNext #1979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dee5653
Update tsconfig.esm.json
iahu Oct 13, 2021
f7cd75b
fix: fix failed to create graphql worker
iahu Oct 18, 2021
f7a9168
Update workerManager.ts
iahu Oct 20, 2021
443abd8
add changeset
acao Oct 29, 2021
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
6 changes: 6 additions & 0 deletions .changeset/afraid-nails-trade.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"graphql-language-service": patch
"monaco-graphql": patch
---

fix: export `monaco-graphql` esm with esm modules, also fix issues with worker manager, resolves #1706 & #1791
4 changes: 3 additions & 1 deletion packages/graphql-language-service/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
},
"dependencies": {
"graphql-language-service-interface": "^2.8.2",
"graphql-language-service-types": "^1.8.0"
"graphql-language-service-parser": "^1.9.2",
"graphql-language-service-types": "^1.8.2",
"graphql-language-service-utils": "^2.5.3"
},
"devDependencies": {
"graphql": "experimental-stream-defer"
Expand Down
11 changes: 11 additions & 0 deletions packages/monaco-graphql/src/GraphQLWorker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,14 @@ export class GraphQLWorker {
return '';
}
}

export default {
GraphQLWorker,
};

export function create(
ctx: worker.IWorkerContext,
createData: ICreateData,
): GraphQLWorker {
return new GraphQLWorker(ctx, createData);
}
2 changes: 1 addition & 1 deletion packages/monaco-graphql/src/monaco.contribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
modeConfigurationDefault,
} from './api';

import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
import * as monaco from 'monaco-editor';

export * from './typings';

Expand Down
6 changes: 3 additions & 3 deletions packages/monaco-graphql/src/workerManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* LICENSE file in the root directory of this source tree.
*/

import { editor as monacoEditor } from 'monaco-editor/esm/vs/editor/editor.api';
import { editor as monacoEditor } from 'monaco-editor';
import { LanguageServiceAPI } from './api';
import { GraphQLWorker } from './GraphQLWorker';

Expand Down Expand Up @@ -68,7 +68,7 @@ export class WorkerManager {
if (!this._client) {
this._worker = monacoEditor.createWebWorker<GraphQLWorker>({
// module that exports the create() method and returns a `GraphQLWorker` instance
moduleId: 'vs/language/graphql/graphqlWorker',
moduleId: 'monaco-graphql/esm/GraphQLWorker.js',

label: this._defaults.languageId,
// passed in to the create() method
Expand All @@ -86,7 +86,7 @@ export class WorkerManager {
try {
this._client = await this._worker.getProxy();
} catch (error) {
throw Error('Error loading serviceworker proxy');
// throw Error(error);
}
}
return this._client as GraphQLWorker;
Expand Down
2 changes: 1 addition & 1 deletion packages/monaco-graphql/tsconfig.esm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "../../resources/tsconfig.base.esm.json",
"compilerOptions": {
"module": "amd",
"module": "ESNext",
"moduleResolution": "node",
"baseUrl": ".",
"rootDir": "./src",
Expand Down