@backstage/plugin-app 0.1.11-next.1 → 0.2.0-next.0

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @backstage/plugin-app
 
+## 0.2.0-next.0
+
+### Minor Changes
+
+- 29786f6: Updated the `app/nav` extension to use the new `NavContentBlueprint`, and removed support for extensions created with the now removed `NavLogoBlueprint`.
+
+### Patch Changes
+
+- f2f133c: Internal update to use the new variant of `ApiBlueprint`.
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.11.0-next.0
+  - @backstage/theme@0.6.8-next.0
+  - @backstage/core-components@0.17.5-next.0
+  - @backstage/core-plugin-api@1.10.9
+  - @backstage/integration-react@1.2.9
+  - @backstage/types@1.2.1
+  - @backstage/plugin-permission-react@0.4.36
+
+## 0.1.11
+
+### Patch Changes
+
+- 09f5e36: Remove trailing slashes in the `AppRoutes` extension to ensure any nested routing behaves correctly.
+- Updated dependencies
+  - @backstage/core-components@0.17.4
+  - @backstage/core-plugin-api@1.10.9
+  - @backstage/theme@0.6.7
+  - @backstage/integration-react@1.2.9
+  - @backstage/frontend-plugin-api@0.10.4
+  - @backstage/plugin-permission-react@0.4.36
+
 ## 0.1.11-next.1
 
 ### Patch Changes

package/dist/defaultApis.esm.js

@@ -2,7 +2,7 @@ import GithubAuth from './packages/core-app-api/src/apis/implementations/auth/gi
 import GitlabAuth from './packages/core-app-api/src/apis/implementations/auth/gitlab/GitlabAuth.esm.js';
 import GoogleAuth from './packages/core-app-api/src/apis/implementations/auth/google/GoogleAuth.esm.js';
 import 'zen-observable';
-import { createApiFactory, discoveryApiRef, configApiRef, alertApiRef, analyticsApiRef, errorApiRef, storageApiRef, fetchApiRef, identityApiRef, oauthRequestApiRef, googleAuthApiRef, microsoftAuthApiRef, githubAuthApiRef, oktaAuthApiRef, gitlabAuthApiRef, oneloginAuthApiRef, bitbucketAuthApiRef, bitbucketServerAuthApiRef, atlassianAuthApiRef, vmwareCloudAuthApiRef } from '@backstage/core-plugin-api';
+import { discoveryApiRef, configApiRef, alertApiRef, analyticsApiRef, errorApiRef, storageApiRef, fetchApiRef, identityApiRef, oauthRequestApiRef, googleAuthApiRef, microsoftAuthApiRef, githubAuthApiRef, oktaAuthApiRef, gitlabAuthApiRef, oneloginAuthApiRef, bitbucketAuthApiRef, bitbucketServerAuthApiRef, atlassianAuthApiRef, vmwareCloudAuthApiRef } from '@backstage/core-plugin-api';
 import OktaAuth from './packages/core-app-api/src/apis/implementations/auth/okta/OktaAuth.esm.js';
 import './packages/core-app-api/src/apis/implementations/auth/saml/types.esm.js';
 import MicrosoftAuth from './packages/core-app-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.esm.js';
@@ -30,332 +30,290 @@ import { DefaultDialogApi } from './apis/DefaultDialogApi.esm.js';
 const apis = [
   ApiBlueprint.make({
     name: "dialog",
-    params: {
-      factory: createApiFactory({
-        api: dialogApiRef,
-        deps: {},
-        factory: () => new DefaultDialogApi()
-      })
-    }
+    params: (define) => define({
+      api: dialogApiRef,
+      deps: {},
+      factory: () => new DefaultDialogApi()
+    })
   }),
   ApiBlueprint.make({
     name: "discovery",
-    params: {
-      factory: createApiFactory({
-        api: discoveryApiRef,
-        deps: { configApi: configApiRef },
-        factory: ({ configApi }) => UrlPatternDiscovery.compile(
-          `${configApi.getString("backend.baseUrl")}/api/{{ pluginId }}`
-        )
-      })
-    }
+    params: (define) => define({
+      api: discoveryApiRef,
+      deps: { configApi: configApiRef },
+      factory: ({ configApi }) => UrlPatternDiscovery.compile(
+        `${configApi.getString("backend.baseUrl")}/api/{{ pluginId }}`
+      )
+    })
   }),
   ApiBlueprint.make({
     name: "alert",
-    params: {
-      factory: createApiFactory({
-        api: alertApiRef,
-        deps: {},
-        factory: () => new AlertApiForwarder()
-      })
-    }
+    params: (define) => define({
+      api: alertApiRef,
+      deps: {},
+      factory: () => new AlertApiForwarder()
+    })
   }),
   ApiBlueprint.make({
     name: "analytics",
-    params: {
-      factory: createApiFactory({
-        api: analyticsApiRef,
-        deps: {},
-        factory: () => new NoOpAnalyticsApi()
-      })
-    }
+    params: (define) => define({
+      api: analyticsApiRef,
+      deps: {},
+      factory: () => new NoOpAnalyticsApi()
+    })
   }),
   ApiBlueprint.make({
     name: "error",
-    params: {
-      factory: createApiFactory({
-        api: errorApiRef,
-        deps: { alertApi: alertApiRef },
-        factory: ({ alertApi }) => {
-          const errorApi = new ErrorAlerter(alertApi, new ErrorApiForwarder());
-          UnhandledErrorForwarder.forward(errorApi, { hidden: false });
-          return errorApi;
-        }
-      })
-    }
+    params: (define) => define({
+      api: errorApiRef,
+      deps: { alertApi: alertApiRef },
+      factory: ({ alertApi }) => {
+        const errorApi = new ErrorAlerter(alertApi, new ErrorApiForwarder());
+        UnhandledErrorForwarder.forward(errorApi, { hidden: false });
+        return errorApi;
+      }
+    })
   }),
   ApiBlueprint.make({
     name: "storage",
-    params: {
-      factory: createApiFactory({
-        api: storageApiRef,
-        deps: { errorApi: errorApiRef },
-        factory: ({ errorApi }) => WebStorage.create({ errorApi })
-      })
-    }
+    params: (define) => define({
+      api: storageApiRef,
+      deps: { errorApi: errorApiRef },
+      factory: ({ errorApi }) => WebStorage.create({ errorApi })
+    })
   }),
   ApiBlueprint.make({
     name: "fetch",
-    params: {
-      factory: createApiFactory({
-        api: fetchApiRef,
-        deps: {
-          configApi: configApiRef,
-          identityApi: identityApiRef,
-          discoveryApi: discoveryApiRef
-        },
-        factory: ({ configApi, identityApi, discoveryApi }) => {
-          return createFetchApi({
-            middleware: [
-              FetchMiddlewares.resolvePluginProtocol({
-                discoveryApi
-              }),
-              FetchMiddlewares.injectIdentityAuth({
-                identityApi,
-                config: configApi
-              })
-            ]
-          });
-        }
-      })
-    }
+    params: (define) => define({
+      api: fetchApiRef,
+      deps: {
+        configApi: configApiRef,
+        identityApi: identityApiRef,
+        discoveryApi: discoveryApiRef
+      },
+      factory: ({ configApi, identityApi, discoveryApi }) => {
+        return createFetchApi({
+          middleware: [
+            FetchMiddlewares.resolvePluginProtocol({
+              discoveryApi
+            }),
+            FetchMiddlewares.injectIdentityAuth({
+              identityApi,
+              config: configApi
+            })
+          ]
+        });
+      }
+    })
   }),
   ApiBlueprint.make({
     name: "oauth-request",
-    params: {
-      factory: createApiFactory({
-        api: oauthRequestApiRef,
-        deps: {},
-        factory: () => new OAuthRequestManager()
-      })
-    }
+    params: (define) => define({
+      api: oauthRequestApiRef,
+      deps: {},
+      factory: () => new OAuthRequestManager()
+    })
   }),
   ApiBlueprint.make({
     name: "google-auth",
-    params: {
-      factory: createApiFactory({
-        api: googleAuthApiRef,
-        deps: {
-          discoveryApi: discoveryApiRef,
-          oauthRequestApi: oauthRequestApiRef,
-          configApi: configApiRef
-        },
-        factory: ({ discoveryApi, oauthRequestApi, configApi }) => GoogleAuth.create({
-          configApi,
-          discoveryApi,
-          oauthRequestApi,
-          environment: configApi.getOptionalString("auth.environment")
-        })
+    params: (define) => define({
+      api: googleAuthApiRef,
+      deps: {
+        discoveryApi: discoveryApiRef,
+        oauthRequestApi: oauthRequestApiRef,
+        configApi: configApiRef
+      },
+      factory: ({ discoveryApi, oauthRequestApi, configApi }) => GoogleAuth.create({
+        configApi,
+        discoveryApi,
+        oauthRequestApi,
+        environment: configApi.getOptionalString("auth.environment")
       })
-    }
+    })
   }),
   ApiBlueprint.make({
     name: "microsoft-auth",
-    params: {
-      factory: createApiFactory({
-        api: microsoftAuthApiRef,
-        deps: {
-          discoveryApi: discoveryApiRef,
-          oauthRequestApi: oauthRequestApiRef,
-          configApi: configApiRef
-        },
-        factory: ({ discoveryApi, oauthRequestApi, configApi }) => MicrosoftAuth.create({
-          configApi,
-          discoveryApi,
-          oauthRequestApi,
-          environment: configApi.getOptionalString("auth.environment")
-        })
+    params: (define) => define({
+      api: microsoftAuthApiRef,
+      deps: {
+        discoveryApi: discoveryApiRef,
+        oauthRequestApi: oauthRequestApiRef,
+        configApi: configApiRef
+      },
+      factory: ({ discoveryApi, oauthRequestApi, configApi }) => MicrosoftAuth.create({
+        configApi,
+        discoveryApi,
+        oauthRequestApi,
+        environment: configApi.getOptionalString("auth.environment")
       })
-    }
+    })
   }),
   ApiBlueprint.make({
     name: "github-auth",
-    params: {
-      factory: createApiFactory({
-        api: githubAuthApiRef,
-        deps: {
-          discoveryApi: discoveryApiRef,
-          oauthRequestApi: oauthRequestApiRef,
-          configApi: configApiRef
-        },
-        factory: ({ discoveryApi, oauthRequestApi, configApi }) => GithubAuth.create({
-          configApi,
-          discoveryApi,
-          oauthRequestApi,
-          defaultScopes: ["read:user"],
-          environment: configApi.getOptionalString("auth.environment")
-        })
+    params: (define) => define({
+      api: githubAuthApiRef,
+      deps: {
+        discoveryApi: discoveryApiRef,
+        oauthRequestApi: oauthRequestApiRef,
+        configApi: configApiRef
+      },
+      factory: ({ discoveryApi, oauthRequestApi, configApi }) => GithubAuth.create({
+        configApi,
+        discoveryApi,
+        oauthRequestApi,
+        defaultScopes: ["read:user"],
+        environment: configApi.getOptionalString("auth.environment")
       })
-    }
+    })
   }),
   ApiBlueprint.make({
     name: "okta-auth",
-    params: {
-      factory: createApiFactory({
-        api: oktaAuthApiRef,
-        deps: {
-          discoveryApi: discoveryApiRef,
-          oauthRequestApi: oauthRequestApiRef,
-          configApi: configApiRef
-        },
-        factory: ({ discoveryApi, oauthRequestApi, configApi }) => OktaAuth.create({
-          configApi,
-          discoveryApi,
-          oauthRequestApi,
-          environment: configApi.getOptionalString("auth.environment")
-        })
+    params: (define) => define({
+      api: oktaAuthApiRef,
+      deps: {
+        discoveryApi: discoveryApiRef,
+        oauthRequestApi: oauthRequestApiRef,
+        configApi: configApiRef
+      },
+      factory: ({ discoveryApi, oauthRequestApi, configApi }) => OktaAuth.create({
+        configApi,
+        discoveryApi,
+        oauthRequestApi,
+        environment: configApi.getOptionalString("auth.environment")
       })
-    }
+    })
   }),
   ApiBlueprint.make({
     name: "gitlab-auth",
-    params: {
-      factory: createApiFactory({
-        api: gitlabAuthApiRef,
-        deps: {
-          discoveryApi: discoveryApiRef,
-          oauthRequestApi: oauthRequestApiRef,
-          configApi: configApiRef
-        },
-        factory: ({ discoveryApi, oauthRequestApi, configApi }) => GitlabAuth.create({
-          configApi,
-          discoveryApi,
-          oauthRequestApi,
-          environment: configApi.getOptionalString("auth.environment")
-        })
+    params: (define) => define({
+      api: gitlabAuthApiRef,
+      deps: {
+        discoveryApi: discoveryApiRef,
+        oauthRequestApi: oauthRequestApiRef,
+        configApi: configApiRef
+      },
+      factory: ({ discoveryApi, oauthRequestApi, configApi }) => GitlabAuth.create({
+        configApi,
+        discoveryApi,
+        oauthRequestApi,
+        environment: configApi.getOptionalString("auth.environment")
       })
-    }
+    })
   }),
   ApiBlueprint.make({
     name: "onelogin-auth",
-    params: {
-      factory: createApiFactory({
-        api: oneloginAuthApiRef,
-        deps: {
-          discoveryApi: discoveryApiRef,
-          oauthRequestApi: oauthRequestApiRef,
-          configApi: configApiRef
-        },
-        factory: ({ discoveryApi, oauthRequestApi, configApi }) => OneLoginAuth.create({
-          configApi,
-          discoveryApi,
-          oauthRequestApi,
-          environment: configApi.getOptionalString("auth.environment")
-        })
+    params: (define) => define({
+      api: oneloginAuthApiRef,
+      deps: {
+        discoveryApi: discoveryApiRef,
+        oauthRequestApi: oauthRequestApiRef,
+        configApi: configApiRef
+      },
+      factory: ({ discoveryApi, oauthRequestApi, configApi }) => OneLoginAuth.create({
+        configApi,
+        discoveryApi,
+        oauthRequestApi,
+        environment: configApi.getOptionalString("auth.environment")
       })
-    }
+    })
   }),
   ApiBlueprint.make({
     name: "bitbucket-auth",
-    params: {
-      factory: createApiFactory({
-        api: bitbucketAuthApiRef,
-        deps: {
-          discoveryApi: discoveryApiRef,
-          oauthRequestApi: oauthRequestApiRef,
-          configApi: configApiRef
-        },
-        factory: ({ discoveryApi, oauthRequestApi, configApi }) => BitbucketAuth.create({
-          configApi,
-          discoveryApi,
-          oauthRequestApi,
-          defaultScopes: ["account"],
-          environment: configApi.getOptionalString("auth.environment")
-        })
+    params: (define) => define({
+      api: bitbucketAuthApiRef,
+      deps: {
+        discoveryApi: discoveryApiRef,
+        oauthRequestApi: oauthRequestApiRef,
+        configApi: configApiRef
+      },
+      factory: ({ discoveryApi, oauthRequestApi, configApi }) => BitbucketAuth.create({
+        configApi,
+        discoveryApi,
+        oauthRequestApi,
+        defaultScopes: ["account"],
+        environment: configApi.getOptionalString("auth.environment")
       })
-    }
+    })
   }),
   ApiBlueprint.make({
     name: "bitbucket-server-auth",
-    params: {
-      factory: createApiFactory({
-        api: bitbucketServerAuthApiRef,
-        deps: {
-          discoveryApi: discoveryApiRef,
-          oauthRequestApi: oauthRequestApiRef,
-          configApi: configApiRef
-        },
-        factory: ({ discoveryApi, oauthRequestApi, configApi }) => BitbucketServerAuth.create({
-          configApi,
-          discoveryApi,
-          oauthRequestApi,
-          defaultScopes: ["REPO_READ"],
-          environment: configApi.getOptionalString("auth.environment")
-        })
+    params: (define) => define({
+      api: bitbucketServerAuthApiRef,
+      deps: {
+        discoveryApi: discoveryApiRef,
+        oauthRequestApi: oauthRequestApiRef,
+        configApi: configApiRef
+      },
+      factory: ({ discoveryApi, oauthRequestApi, configApi }) => BitbucketServerAuth.create({
+        configApi,
+        discoveryApi,
+        oauthRequestApi,
+        defaultScopes: ["REPO_READ"],
+        environment: configApi.getOptionalString("auth.environment")
       })
-    }
+    })
   }),
   ApiBlueprint.make({
     name: "atlassian-auth",
-    params: {
-      factory: createApiFactory({
-        api: atlassianAuthApiRef,
-        deps: {
-          discoveryApi: discoveryApiRef,
-          oauthRequestApi: oauthRequestApiRef,
-          configApi: configApiRef
-        },
-        factory: ({ discoveryApi, oauthRequestApi, configApi }) => {
-          return AtlassianAuth.create({
-            configApi,
-            discoveryApi,
-            oauthRequestApi,
-            environment: configApi.getOptionalString("auth.environment")
-          });
-        }
-      })
-    }
+    params: (define) => define({
+      api: atlassianAuthApiRef,
+      deps: {
+        discoveryApi: discoveryApiRef,
+        oauthRequestApi: oauthRequestApiRef,
+        configApi: configApiRef
+      },
+      factory: ({ discoveryApi, oauthRequestApi, configApi }) => {
+        return AtlassianAuth.create({
+          configApi,
+          discoveryApi,
+          oauthRequestApi,
+          environment: configApi.getOptionalString("auth.environment")
+        });
+      }
+    })
   }),
   ApiBlueprint.make({
     name: "vmware-cloud-auth",
-    params: {
-      factory: createApiFactory({
-        api: vmwareCloudAuthApiRef,
-        deps: {
-          discoveryApi: discoveryApiRef,
-          oauthRequestApi: oauthRequestApiRef,
-          configApi: configApiRef
-        },
-        factory: ({ discoveryApi, oauthRequestApi, configApi }) => {
-          return VMwareCloudAuth.create({
-            configApi,
-            discoveryApi,
-            oauthRequestApi,
-            environment: configApi.getOptionalString("auth.environment")
-          });
-        }
-      })
-    }
+    params: (define) => define({
+      api: vmwareCloudAuthApiRef,
+      deps: {
+        discoveryApi: discoveryApiRef,
+        oauthRequestApi: oauthRequestApiRef,
+        configApi: configApiRef
+      },
+      factory: ({ discoveryApi, oauthRequestApi, configApi }) => {
+        return VMwareCloudAuth.create({
+          configApi,
+          discoveryApi,
+          oauthRequestApi,
+          environment: configApi.getOptionalString("auth.environment")
+        });
+      }
+    })
   }),
   ApiBlueprint.make({
     name: "permission",
-    params: {
-      factory: createApiFactory({
-        api: permissionApiRef,
-        deps: {
-          discovery: discoveryApiRef,
-          identity: identityApiRef,
-          config: configApiRef
-        },
-        factory: ({ config, discovery, identity }) => IdentityPermissionApi.create({ config, discovery, identity })
-      })
-    }
+    params: (define) => define({
+      api: permissionApiRef,
+      deps: {
+        discovery: discoveryApiRef,
+        identity: identityApiRef,
+        config: configApiRef
+      },
+      factory: ({ config, discovery, identity }) => IdentityPermissionApi.create({ config, discovery, identity })
+    })
   }),
   ApiBlueprint.make({
     name: "scm-auth",
-    params: {
-      factory: ScmAuth.createDefaultApiFactory()
-    }
+    params: (define) => define(ScmAuth.createDefaultApiFactory())
   }),
   ApiBlueprint.make({
     name: "scm-integrations",
-    params: {
-      factory: createApiFactory({
-        api: scmIntegrationsApiRef,
-        deps: { configApi: configApiRef },
-        factory: ({ configApi }) => ScmIntegrationsApi.fromConfig(configApi)
-      })
-    }
+    params: (define) => define({
+      api: scmIntegrationsApiRef,
+      deps: { configApi: configApiRef },
+      factory: ({ configApi }) => ScmIntegrationsApi.fromConfig(configApi)
+    })
   })
 ];