fix vscode-graphql bundling, update vsce, remove escape-html (#2802) …

…solves #2801

.changeset/fresh-starfishes-rhyme.md

@@ -0,0 +1,6 @@
+---
+'vscode-graphql': patch
+'vscode-graphql-execution': patch
+---
+
+fix bug with vscode-graphql-execution

.vscode/tasks.json

@@ -14,6 +14,20 @@
         "kind": "build",
         "isDefault": true
       }
+    },
+    {
+      "label": "watch-vscode-exec",
+      "type": "npm",
+      "script": "watch-vscode-exec",
+      "problemMatcher": ["$tsc-watch"],
+      "isBackground": true,
+      "presentation": {
+        "reveal": "always"
+      },
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      }
     }
   ]
 }

package.json

@@ -45,9 +45,9 @@
     "build:packages": "yarn tsc",
     "build:watch": "yarn tsc --watch",
     "watch": "yarn build:watch",
-    "watch-vscode": "concurrently --raw \"yarn tsc && yarn tsc --watch\" \"yarn workspace vscode-graphql run compile --watch\"",
-    "watch-vscode-exec": "concurrently --raw \"yarn tsc && yarn tsc --watch\" \"yarn workspace vscode-graphql-exec run compile --watch\"",
-    "check": "yarn tsc --dry",
+    "watch-vscode": "concurrently --raw \"yarn tsc && yarn build:watch\" \"yarn workspace vscode-graphql run compile --watch\"",
+    "watch-vscode-exec": "yarn build:watch",
+    "check": "yarn tsc --noEmit",
     "cypress-open": "yarn workspace graphiql cypress-open",
     "dev-graphiql": "yarn workspace graphiql dev",
     "e2e": "yarn run e2e:build && yarn workspace graphiql e2e",

packages/vscode-graphql-execution/.vscodeignore

@@ -0,0 +1,5 @@
+src/
+tsconfig.json
+yarn-error.log
+**/*.tsbuildinfo
+**/*.d.ts

packages/vscode-graphql-execution/package.json

@@ -82,9 +82,8 @@
     "url": "https://github.com/graphql/graphiql",
     "directory": "packages/vscode-graphql-execution"
   },
-  "homepage": "https://github.com/graphql/graphiql/blob/main/packages/vscode-graphql-inline-exec/README.md",
+  "homepage": "https://github.com/graphql/graphiql/blob/main/packages/vscode-graphql-execution/README.md",
   "scripts": {
-    "compile": "yarn tsc",
     "vsce:package": "vsce package --yarn",
     "vsce:prepublish": "npm run vsce:package",
     "vsce:publish": "vsce publish --yarn",
@@ -98,18 +97,15 @@
     "@types/node": "16.11.26",
     "@types/node-fetch": "3.0.3",
     "@types/vscode": "1.62.0",
-    "@types/escape-html": "^1.0.2",
     "@types/ws": "8.2.2",
-    "esbuild": "0.15.1",
+    "esbuild": "0.15.10",
     "ovsx": "0.3.0",
-    "vsce": "2.6.7"
+    "vsce": "^2.11.0"
   },
   "dependencies": {
     "@urql/core": "2.6.1",
-    "babel-polyfill": "6.26.0",
     "capitalize": "2.0.4",
     "dotenv": "10.0.0",
-    "escape-html": "1.0.3",
     "graphql-config": "4.3.0",
     "graphql-tag": "2.12.6",
     "graphql-ws": "5.10.0",

packages/vscode-graphql-execution/src/helpers/source.ts

@@ -91,7 +91,7 @@ export class SourceHelper {
             JSON.parse(value);
             return null;
           } catch {
-            return false;
+            return undefined;
           }
       }
     } catch {

packages/vscode-graphql-execution/src/providers/exec-content.ts

@@ -10,7 +10,6 @@ import {
   WebviewPanel,
   WorkspaceFolder,
 } from 'vscode';
-import escapeHtml from 'escape-html';
 import type { ExtractedTemplateLiteral } from '../helpers/source';
 import { loadConfig, GraphQLProjectConfig } from 'graphql-config';
 import { visit, VariableDefinitionNode } from 'graphql';
@@ -202,9 +201,9 @@ export class GraphQLContentProvider implements TextDocumentContentProvider {
 
           const updateCallback = (data: string, operation: string) => {
             if (operation === 'subscription') {
-              this.html = `<pre>${escapeHtml(data)}</pre>` + this.html;
+              this.html = `<pre>${data}</pre>` + this.html;
             } else {
-              this.html += `<pre>${escapeHtml(data)}</pre>`;
+              this.html += `<pre>${data}</pre>`;
             }
             this.update(this.uri);
             this.updatePanel();

packages/vscode-graphql/package.json

@@ -168,9 +168,9 @@
   "devDependencies": {
     "@types/capitalize": "2.0.0",
     "@types/vscode": "1.62.0",
-    "esbuild": "0.15.1",
+    "esbuild": "0.15.10",
     "ovsx": "0.3.0",
-    "vsce": "^2.7.0"
+    "vsce": "^2.11.0"
   },
   "dependencies": {
     "graphql": "^16.4.0",

resources/tsconfig.build.cjs.json

@@ -25,6 +25,9 @@
     },
     {
       "path": "../packages/vscode-graphql"
+    },
+    {
+      "path": "../packages/vscode-graphql-execution"
     }
   ]
 }