Merge branch 'main' into fix-monaco-react

graphql · Jun 24, 2023 · 8d79e44 · 8d79e44
2 parents 9332d33 + 0fa98a2
commit 8d79e44
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -61,6 +61,7 @@ module.exports = {
       },
       rules: {
         '@shopify/prefer-early-return': ['error', { maximumStatements: 2 }],
+        '@shopify/prefer-class-properties': 'off', // enable after https://github.com/Shopify/web-configs/issues/387 will be fixed
         'sonarjs/no-inverted-boolean-check': 'error',
         '@arthurgeron/react-usememo/require-usememo': [
           'error',

diff --git a/packages/graphiql-toolkit/src/storage/__tests__/query.spec.ts b/packages/graphiql-toolkit/src/storage/__tests__/query.spec.ts
@@ -4,11 +4,10 @@ import { QueryStore } from '../query';
 class StorageMock {
   shouldThrow: () => boolean;
   count: number;
-  map: any;
+  map = {};
   storage: Storage;
   constructor(shouldThrow: () => boolean) {
     this.shouldThrow = shouldThrow;
-    this.map = {};
   }
 
   set(key: string, value: string) {

diff --git a/packages/graphql-language-service/src/parser/CharacterStream.ts b/packages/graphql-language-service/src/parser/CharacterStream.ts
@@ -20,13 +20,11 @@
 import { TokenPattern, CharacterStreamInterface } from './types';
 
 export default class CharacterStream implements CharacterStreamInterface {
-  private _start: number;
-  private _pos: number;
+  private _start = 0;
+  private _pos = 0;
   private _sourceText: string;
 
   constructor(sourceText: string) {
-    this._start = 0;
-    this._pos = 0;
     this._sourceText = sourceText;
   }
 

diff --git a/packages/monaco-graphql/src/workerManager.ts b/packages/monaco-graphql/src/workerManager.ts
@@ -15,24 +15,21 @@ const STOP_WHEN_IDLE_FOR = 2 * 60 * 1000; // 2min
 export class WorkerManager {
   private _defaults: MonacoGraphQLAPI;
   private _idleCheckInterval: number;
-  private _lastUsedTime: number;
+  private _lastUsedTime = 0;
   private _configChangeListener: IDisposable;
-  private _worker: editor.MonacoWebWorker<GraphQLWorker> | null;
-  private _client: GraphQLWorker | null;
+  private _worker: editor.MonacoWebWorker<GraphQLWorker> | null = null;
+  private _client: GraphQLWorker | null = null;
 
   constructor(defaults: MonacoGraphQLAPI) {
     this._defaults = defaults;
-    this._worker = null;
     this._idleCheckInterval = window.setInterval(
       () => this._checkIfIdle(),
       30 * 1000,
     );
-    this._lastUsedTime = 0;
     // this is where we re-start the worker on config changes
     this._configChangeListener = this._defaults.onDidChange(() => {
       this._stopWorker();
     });
-    this._client = null;
   }
 
   private _stopWorker(): void {