Merge branch 'master' into migrating_k8s_frontend

Signed-off-by: Nurit Izrailov <38442135+nuritizra@users.noreply.github.com>

packages/app-next/CHANGELOG.md

@@ -1,5 +1,48 @@
 # example-app-next
 
+## 0.0.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.27.0-next.0
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/plugin-search-react@1.7.14-next.0
+  - @backstage/plugin-home@0.7.8-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/plugin-scaffolder-react@1.11.0-next.0
+  - @backstage/frontend-app-api@0.7.4-next.0
+  - @backstage/plugin-catalog-graph@0.4.8-next.0
+  - @backstage/plugin-scaffolder@1.23.1-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/plugin-auth-react@0.1.5-next.0
+  - @backstage/app-defaults@1.5.9-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/theme@0.5.6
+  - @backstage/plugin-api-docs@0.11.8-next.0
+  - @backstage/plugin-app-visualizer@0.1.9-next.0
+  - @backstage/plugin-catalog@1.21.2-next.0
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-catalog-import@0.12.2-next.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.7-next.0
+  - @backstage/plugin-kubernetes@0.11.13-next.0
+  - @backstage/plugin-kubernetes-cluster@0.0.14-next.0
+  - @backstage/plugin-notifications@0.2.4-next.0
+  - @backstage/plugin-org@0.6.28-next.0
+  - @backstage/plugin-permission-react@0.4.24
+  - @backstage/plugin-search@1.4.15-next.0
+  - @backstage/plugin-search-common@1.2.13
+  - @backstage/plugin-signals@0.0.9-next.0
+  - @backstage/plugin-techdocs@1.10.8-next.0
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.13-next.0
+  - @backstage/plugin-techdocs-react@1.2.7-next.0
+  - @backstage/plugin-user-settings@0.8.10-next.0
+
 ## 0.0.13
 
 ### Patch Changes

packages/app-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "example-app-next",
-  "version": "0.0.13",
+  "version": "0.0.14-next.0",
   "private": true,
   "repository": {
     "type": "git",

packages/app-next/src/App.tsx

@@ -36,19 +36,14 @@ import { convertLegacyApp } from '@backstage/core-compat-api';
 import { FlatRoutes } from '@backstage/core-app-api';
 import { Route } from 'react-router';
 import { CatalogImportPage } from '@backstage/plugin-catalog-import';
-import {
-  createApiFactory,
-  configApiRef,
-  SignInPageProps,
-} from '@backstage/core-plugin-api';
+import { createApiFactory, configApiRef } from '@backstage/core-plugin-api';
 import {
   ScmAuth,
   ScmIntegrationsApi,
   scmIntegrationsApiRef,
 } from '@backstage/integration-react';
-import { createSignInPageExtension } from '@backstage/frontend-plugin-api';
-import { SignInPage } from '@backstage/core-components';
 import kubernetesPlugin from '@backstage/plugin-kubernetes/alpha';
+import { signInPageOverrides } from './overrides/SignInPage';
 
 /*
 
@@ -91,12 +86,6 @@ const homePageExtension = createExtension({
   },
 });
 
-const signInPage = createSignInPageExtension({
-  name: 'guest',
-  loader: async () => (props: SignInPageProps) =>
-    <SignInPage {...props} providers={['guest']} />,
-});
-
 const scmAuthExtension = createApiExtension({
   factory: ScmAuth.createDefaultApiFactory(),
 });
@@ -123,13 +112,13 @@ const app = createApp({
     homePlugin,
     appVisualizerPlugin,
     kubernetesPlugin,
+    signInPageOverrides,
     ...collectedLegacyPlugins,
     createExtensionOverrides({
       extensions: [
         homePageExtension,
         scmAuthExtension,
         scmIntegrationApi,
-        signInPage,
         notFoundErrorPage,
       ],
     }),

packages/app-next/src/index-public-experimental.tsx

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import { CookieAuthRedirect } from '@backstage/plugin-auth-react';
+import { createApp } from '@backstage/frontend-app-api';
+import { signInPageOverrides } from './overrides/SignInPage';
+import {
+  coreExtensionData,
+  createExtension,
+  createExtensionOverrides,
+} from '@backstage/frontend-plugin-api';
+
+const authRedirectExtension = createExtension({
+  namespace: 'app',
+  name: 'layout',
+  attachTo: { id: 'app/root', input: 'children' },
+  output: {
+    element: coreExtensionData.reactElement,
+  },
+  factory: () => ({
+    element: <CookieAuthRedirect />,
+  }),
+});
+
+const app = createApp({
+  features: [
+    signInPageOverrides,
+    createExtensionOverrides({
+      extensions: [authRedirectExtension],
+    }),
+  ],
+});
+
+ReactDOM.createRoot(document.getElementById('root')!).render(app.createRoot());

packages/app-next/src/overrides/SignInPage.tsx

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { SignInPage } from '@backstage/core-components';
+import {
+  createExtensionOverrides,
+  createSignInPageExtension,
+} from '@backstage/frontend-plugin-api';
+
+const signInPage = createSignInPageExtension({
+  name: 'guest',
+  loader: async () => props => <SignInPage {...props} providers={['guest']} />,
+});
+
+export const signInPageOverrides = createExtensionOverrides({
+  extensions: [signInPage],
+});