Merge remote-tracking branch 'upstream/master' into master

packages/app/CHANGELOG.md

@@ -1,5 +1,50 @@
 # example-app
 
+## 0.2.9
+
+### Patch Changes
+
+- Updated dependencies [ab0892358]
+- Updated dependencies [37a7d26c4]
+- Updated dependencies [8e083f41f]
+- Updated dependencies [88da267cc]
+- Updated dependencies [9c09a364f]
+- Updated dependencies [01707438b]
+- Updated dependencies [edb7d0775]
+- Updated dependencies [818d45e94]
+- Updated dependencies [0588be01f]
+- Updated dependencies [b8abdda57]
+- Updated dependencies [b7a124883]
+- Updated dependencies [bc909178d]
+- Updated dependencies [947d3c269]
+  - @backstage/plugin-cost-insights@0.5.5
+  - @backstage/plugin-tech-radar@0.3.2
+  - @backstage/cli@0.4.5
+  - @backstage/plugin-scaffolder@0.3.6
+  - @backstage/plugin-sentry@0.3.2
+  - @backstage/plugin-catalog@0.2.10
+  - @backstage/plugin-search@0.2.5
+  - @backstage/plugin-catalog-import@0.3.3
+  - @backstage/plugin-pagerduty@0.2.5
+
+## 0.2.8
+
+### Patch Changes
+
+- Updated dependencies [19554f6d6]
+- Updated dependencies [1dc445e89]
+- Updated dependencies [342270e4d]
+- Updated dependencies [7d72f9b09]
+  - @backstage/cli@0.4.3
+  - @backstage/plugin-github-actions@0.2.6
+  - @backstage/plugin-scaffolder@0.3.5
+  - @backstage/core@0.4.2
+  - @backstage/test-utils@0.1.6
+  - @backstage/plugin-graphiql@0.2.3
+  - @backstage/plugin-catalog@0.2.8
+  - @backstage/plugin-pagerduty@0.2.4
+  - @backstage/plugin-techdocs@0.5.1
+
 ## 0.2.7
 
 ### Patch Changes

packages/app/package.json

@@ -1,40 +1,39 @@
 {
   "name": "example-app",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "private": true,
   "bundled": true,
   "dependencies": {
     "@backstage/catalog-model": "^0.6.0",
-    "@backstage/cli": "^0.4.2",
-    "@backstage/core": "^0.4.1",
+    "@backstage/cli": "^0.4.5",
+    "@backstage/core": "^0.4.2",
     "@backstage/plugin-api-docs": "^0.4.1",
-    "@backstage/plugin-catalog": "^0.2.7",
-    "@backstage/plugin-catalog-import": "^0.3.2",
+    "@backstage/plugin-catalog": "^0.2.10",
+    "@backstage/plugin-catalog-import": "^0.3.3",
     "@backstage/plugin-circleci": "^0.2.5",
     "@backstage/plugin-cloudbuild": "^0.2.5",
-    "@backstage/plugin-cost-insights": "^0.5.2",
+    "@backstage/plugin-cost-insights": "^0.5.5",
     "@backstage/plugin-explore": "^0.2.2",
     "@backstage/plugin-gcp-projects": "^0.2.2",
-    "@backstage/plugin-github-actions": "^0.2.5",
+    "@backstage/plugin-github-actions": "^0.2.6",
     "@backstage/plugin-gitops-profiles": "^0.2.2",
-    "@backstage/plugin-graphiql": "^0.2.2",
+    "@backstage/plugin-graphiql": "^0.2.3",
+    "@backstage/plugin-org": "^0.3.2",
     "@backstage/plugin-jenkins": "^0.3.4",
     "@backstage/plugin-kafka": "^0.1.0",
     "@backstage/plugin-kubernetes": "^0.3.3",
     "@backstage/plugin-lighthouse": "^0.2.6",
     "@backstage/plugin-newrelic": "^0.2.2",
-    "@backstage/plugin-org": "^0.3.2",
-    "@backstage/plugin-pagerduty": "0.2.3",
+    "@backstage/plugin-pagerduty": "0.2.5",
     "@backstage/plugin-register-component": "^0.2.5",
     "@backstage/plugin-rollbar": "^0.2.7",
-    "@backstage/plugin-scaffolder": "^0.3.4",
-    "@backstage/plugin-search": "^0.2.4",
-    "@backstage/plugin-sentry": "^0.3.1",
-    "@backstage/plugin-tech-radar": "^0.3.1",
-    "@backstage/plugin-techdocs": "^0.5.0",
+    "@backstage/plugin-scaffolder": "^0.3.6",
+    "@backstage/plugin-sentry": "^0.3.2",
+    "@backstage/plugin-search": "^0.2.5",
+    "@backstage/plugin-tech-radar": "^0.3.2",
+    "@backstage/plugin-techdocs": "^0.5.1",
     "@backstage/plugin-user-settings": "^0.2.3",
     "@backstage/plugin-welcome": "^0.2.3",
-    "@backstage/test-utils": "^0.1.5",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -54,6 +53,7 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
+    "@backstage/test-utils": "^0.1.6",
     "@testing-library/cypress": "^7.0.1",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",

packages/app/src/App.tsx

@@ -29,7 +29,7 @@ import { hot } from 'react-hot-loader/root';
 import { providers } from './identityProviders';
 import { Router as CatalogRouter } from '@backstage/plugin-catalog';
 import { Router as DocsRouter } from '@backstage/plugin-techdocs';
-import { GraphiQLPage } from '@backstage/plugin-graphiql';
+import { Router as GraphiQLRouter } from '@backstage/plugin-graphiql';
 import { Router as TechRadarRouter } from '@backstage/plugin-tech-radar';
 import { Router as LighthouseRouter } from '@backstage/plugin-lighthouse';
 import { Router as RegisterComponentRouter } from '@backstage/plugin-register-component';
@@ -81,7 +81,7 @@ const AppRoutes = () => (
       path="/tech-radar"
       element={<TechRadarRouter width={1500} height={800} />}
     />
-    <Route path="/graphiql" element={<GraphiQLPage />} />
+    <Route path="/graphiql" element={<GraphiQLRouter />} />
     <Route path="/lighthouse/*" element={<LighthouseRouter />} />
     <Route
       path="/register-component"

packages/app/src/index.tsx

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line monorepo/no-internal-import
 import '@backstage/cli/asset-types';
 import React from 'react';
 import ReactDOM from 'react-dom';