Merge branch 'master' into feat/add-devtools-extension

Signed-off-by: secustor <sebastian@poxhofer.at>

# Conflicts:
#	plugins/catalog-unprocessed-entities/package.json
#	plugins/devtools/report-alpha.api.md
#	plugins/devtools/src/alpha/plugin.tsx
#	yarn.lock

plugins/devtools/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @backstage/plugin-devtools
 
+## 0.1.34-next.0
+
+### Patch Changes
+
+- d02db50: Remove unnecessary use of `compatWrapper` and `convertLegacyRouteRef`(s) for the new frontend system.
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.13.2-next.0
+  - @backstage/core-plugin-api@1.12.1-next.0
+  - @backstage/core-components@0.18.4-next.0
+  - @backstage/plugin-permission-react@0.4.39-next.0
+  - @backstage/errors@1.2.7
+  - @backstage/plugin-devtools-common@0.1.19
+
+## 0.1.33
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.13.0
+  - @backstage/core-compat-api@0.5.4
+  - @backstage/core-components@0.18.3
+  - @backstage/core-plugin-api@1.12.0
+  - @backstage/plugin-devtools-common@0.1.19
+  - @backstage/plugin-permission-react@0.4.38
+
 ## 0.1.33-next.0
 
 ### Patch Changes

plugins/devtools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-devtools",
-  "version": "0.1.33-next.0",
+  "version": "0.1.34-next.0",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "devtools",
@@ -52,7 +52,6 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/core-compat-api": "workspace:^",
     "@backstage/core-components": "workspace:^",
     "@backstage/core-plugin-api": "workspace:^",
     "@backstage/errors": "workspace:^",

plugins/devtools/report-alpha.api.md

@@ -9,12 +9,18 @@ import { ApiFactory } from '@backstage/frontend-plugin-api';
 import { ConfigurableExtensionDataRef } from '@backstage/frontend-plugin-api';
 import { ExtensionBlueprintParams } from '@backstage/frontend-plugin-api';
 import { ExtensionDataRef } from '@backstage/frontend-plugin-api';
+<<<<<<< HEAD
 import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { ExtensionInput } from '@backstage/frontend-plugin-api';
 import { IconComponent } from '@backstage/core-plugin-api';
+=======
+import { IconComponent } from '@backstage/frontend-plugin-api';
+>>>>>>> master
 import { JSX as JSX_2 } from 'react';
+import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api';
-import { RouteRef } from '@backstage/frontend-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
+import { RouteRef as RouteRef_2 } from '@backstage/frontend-plugin-api';
 
 // @alpha (undocumented)
 const _default: OverridableFrontendPlugin<
@@ -23,7 +29,7 @@ const _default: OverridableFrontendPlugin<
   },
   {},
   {
-    'api:devtools': ExtensionDefinition<{
+    'api:devtools': OverridableExtensionDefinition<{
       kind: 'api';
       name: undefined;
       config: {};
@@ -38,7 +44,7 @@ const _default: OverridableFrontendPlugin<
         params: ApiFactory<TApi, TImpl, TDeps>,
       ) => ExtensionBlueprintParams<AnyApiFactory>;
     }>;
-    'nav-item:devtools': ExtensionDefinition<{
+    'nav-item:devtools': OverridableExtensionDefinition<{
       kind: 'nav-item';
       name: undefined;
       config: {};
@@ -47,7 +53,7 @@ const _default: OverridableFrontendPlugin<
         {
           title: string;
           icon: IconComponent;
-          routeRef: RouteRef<undefined>;
+          routeRef: RouteRef_2<undefined>;
         },
         'core.nav-item.target',
         {}
@@ -56,10 +62,16 @@ const _default: OverridableFrontendPlugin<
       params: {
         title: string;
         icon: IconComponent;
-        routeRef: RouteRef<undefined>;
+        routeRef: RouteRef_2<undefined>;
       };
     }>;
+<<<<<<< HEAD
     'page:devtools': ExtensionDefinition<{
+=======
+    'page:devtools': OverridableExtensionDefinition<{
+      kind: 'page';
+      name: undefined;
+>>>>>>> master
       config: {
         path: string | undefined;
       };
@@ -70,7 +82,7 @@ const _default: OverridableFrontendPlugin<
         | ExtensionDataRef<string, 'core.routing.path', {}>
         | ExtensionDataRef<JSX_2.Element, 'core.reactElement', {}>
         | ExtensionDataRef<
-            RouteRef<AnyRouteRefParams>,
+            RouteRef_2<AnyRouteRefParams>,
             'core.routing.ref',
             {
               optional: true;
@@ -99,9 +111,14 @@ const _default: OverridableFrontendPlugin<
       params: {
         defaultPath?: [Error: `Use the 'path' param instead`];
         path: string;
+<<<<<<< HEAD
         loader: () => Promise</** @alpha */
         JSX.Element>;
         routeRef?: RouteRef;
+=======
+        loader: () => Promise<JSX.Element>;
+        routeRef?: RouteRef_2;
+>>>>>>> master
       };
     }>;
   }

plugins/devtools/src/alpha/plugin.tsx

@@ -26,10 +26,6 @@ import {
 } from '@backstage/frontend-plugin-api';
 
 import { devToolsApiRef, DevToolsClient } from '../api';
-import {
-  compatWrapper,
-  convertLegacyRouteRef,
-} from '@backstage/core-compat-api';
 import BuildIcon from '@material-ui/icons/Build';
 import { rootRouteRef } from '../routes';
 
@@ -65,7 +61,7 @@ export const devToolsPage = PageBlueprint.makeWithOverrides({
   factory(originalFactory, { inputs }) {
     return originalFactory({
       path: '/devtools',
-      routeRef: convertLegacyRouteRef(rootRouteRef),
+      routeRef: rootRouteRef,
       loader: () => {
         const extensions = inputs.contents.map(content => ({
           path: content.get(coreExtensionData.routePath),
@@ -73,7 +69,7 @@ export const devToolsPage = PageBlueprint.makeWithOverrides({
           children: content.get(coreExtensionData.reactElement),
         }));
         return import('../components/DevToolsPage').then(m =>
-          compatWrapper(<m.DevToolsPage extensions={extensions} />),
+          <m.DevToolsPage extensions={extensions} />
         );
       },
     });
@@ -84,7 +80,7 @@ export const devToolsPage = PageBlueprint.makeWithOverrides({
 export const devToolsNavItem = NavItemBlueprint.make({
   params: {
     title: 'DevTools',
-    routeRef: convertLegacyRouteRef(rootRouteRef),
+    routeRef: rootRouteRef,
     icon: BuildIcon,
   },
 });
@@ -94,7 +90,7 @@ export default createFrontendPlugin({
   pluginId: 'devtools',
   info: { packageJson: () => import('../../package.json') },
   routes: {
-    root: convertLegacyRouteRef(rootRouteRef),
+    root: rootRouteRef,
   },
   extensions: [devToolsApi, devToolsPage, devToolsNavItem],
 });