Merge remote-tracking branch 'upstream/master'

plugins/graphiql/package.json

@@ -17,6 +17,7 @@
   ],
   "license": "Apache-2.0",
   "main": "dist/index.esm.js",
+  "main:src": "src/index.ts",
   "types": "src/index.ts",
   "scripts": {
     "build": "backstage-cli plugin:build",
@@ -46,7 +47,8 @@
     "@backstage/test-utils": "^0.1.1-alpha.5",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.3.2",
-    "@testing-library/user-event": "^7.1.2",
+    "@testing-library/user-event": "^10.2.4",
+    "@types/codemirror": "^0.0.93",
     "@types/jest": "^25.2.1",
     "@types/node": "^12.0.0",
     "@types/testing-library__jest-dom": "^5.0.4",

plugins/graphiql/src/components/GraphiQLPage/GraphiQLPage.test.tsx

@@ -22,7 +22,7 @@ import { ApiProvider, ApiRegistry } from '@backstage/core';
 import { renderWithEffects } from '@backstage/test-utils';
 import { GraphQLBrowseApi, graphQlBrowseApiRef } from '../../lib/api';
 
-jest.mock('components/GraphiQLBrowser', () => ({
+jest.mock('../GraphiQLBrowser', () => ({
   GraphiQLBrowser: () => '<GraphiQLBrowser />',
 }));
 

plugins/graphiql/tsconfig.json

@@ -1,5 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "include": ["src", "dev"],
-  "compilerOptions": {}
-}