Merge pull request #7 from ServerlessOpsIO/update/1.43.1

Update/1.43.1

Author: tmclaugh

.github/workflows/feature-branch.yml .github/workflows/branch.yml.github/workflows/feature-branch.yml renamed to .github/workflows/branch.yml

@@ -1,10 +1,10 @@
-name: Featiure Branch
+name: Branch
 
 on:
   workflow_dispatch:
   push:
-    branches:
-      - feature/*
+    branches-ignore:
+      - main
 
 jobs:
   build_infra:

src/.gitignore

@@ -7,7 +7,6 @@ logs
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-lerna-debug.log*
 
 # Coverage directory generated when running tests with coverage
 coverage
@@ -52,3 +51,6 @@ site
 
 # E2E test reports
 e2e-test-report/
+
+# Cache
+.cache/

src/README.md

@@ -6,5 +6,5 @@ To start the app, run:
 
 ```sh
 yarn install
-yarn dev
+yarn start
 ```

src/backstage.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.31.1"
+  "version": "1.43.1"
 }

src/examples/template/template.yaml

@@ -48,13 +48,15 @@ spec:
           name: ${{ parameters.name }}
 
     # This step publishes the contents of the working directory to GitHub.
+    # If you or your organization prefer another default branch name over 'main'
+    # you can change that here.
     - id: publish
       name: Publish
       action: publish:github
       input:
-        allowedHosts: ['github.com']
         description: This is ${{ parameters.name }}
         repoUrl: ${{ parameters.repoUrl }}
+        defaultBranch: 'main'
 
     # The final step is to register our new component in the catalog.
     - id: register
@@ -64,6 +66,18 @@ spec:
         repoContentsUrl: ${{ steps['publish'].output.repoContentsUrl }}
         catalogInfoPath: '/catalog-info.yaml'
 
+    # Let's notify the user that the template has completed using the Notification action
+    - id: notify
+      name: Notify
+      action: notification:send
+      input:
+        recipients: entity
+        entityRefs:
+          - user:default/guest
+        title: 'Template executed'
+        info: 'Your template has been executed'
+        severity: 'normal'
+
   # Outputs are displayed to the user after a successful execution of the template.
   output:
     links:

src/package.json

@@ -3,12 +3,10 @@
   "version": "1.0.0",
   "private": true,
   "engines": {
-    "node": "lts/iron"
+    "node": "lts/jod"
   },
   "scripts": {
-    "dev": "NODE_OPTIONS=--no-node-snapshot yarn workspaces foreach -A --include backend --include app --parallel -v -i run start",
-    "start": "yarn workspace app start",
-    "start-backend": "yarn workspace backend start",
+    "start": "backstage-cli repo start",
     "build:backend": "yarn workspace backend build",
     "build:all": "backstage-cli repo build --all",
     "build-image": "yarn workspace backend build-image",
@@ -22,7 +20,7 @@
     "lint": "backstage-cli repo lint --since origin/main",
     "lint:all": "backstage-cli repo lint",
     "prettier:check": "prettier --check .",
-    "new": "backstage-cli new --scope internal"
+    "new": "backstage-cli new"
   },
   "workspaces": {
     "packages": [
@@ -31,19 +29,19 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.27.1",
+    "@backstage/cli": "^0.34.3",
     "@backstage/e2e-test-utils": "^0.1.1",
     "@playwright/test": "^1.32.3",
     "@spotify/prettier-config": "^12.0.0",
     "node-gyp": "^10.0.0",
     "prettier": "^2.3.2",
-    "typescript": "~5.4.0"
+    "typescript": "~5.8.0"
   },
   "resolutions": {
     "@types/react": "^18",
     "@types/react-dom": "^18"
   },
-  "prettier": "@spotify/prettier-config",
+  "prettier": "@backstage/cli/config/prettier-config",
   "lint-staged": {
     "*.{js,jsx,ts,tsx,mjs,cjs}": [
       "eslint --fix",

src/packages/app/package.json

@@ -14,30 +14,33 @@
     "lint": "backstage-cli package lint"
   },
   "dependencies": {
-    "@backstage/app-defaults": "^1.5.11",
-    "@backstage/catalog-model": "^1.7.0",
-    "@backstage/cli": "^0.27.1",
-    "@backstage/core-app-api": "^1.15.0",
-    "@backstage/core-components": "^0.15.0",
-    "@backstage/core-plugin-api": "^1.9.4",
-    "@backstage/integration-react": "^1.1.31",
-    "@backstage/plugin-api-docs": "^0.11.9",
-    "@backstage/plugin-catalog": "^1.23.0",
-    "@backstage/plugin-catalog-common": "^1.1.0",
-    "@backstage/plugin-catalog-graph": "^0.4.9",
-    "@backstage/plugin-catalog-import": "^0.12.3",
-    "@backstage/plugin-catalog-react": "^1.13.0",
-    "@backstage/plugin-org": "^0.6.29",
-    "@backstage/plugin-permission-react": "^0.4.26",
-    "@backstage/plugin-scaffolder": "^1.25.0",
-    "@backstage/plugin-scaffolder-react": "^1.14.1",
-    "@backstage/plugin-search": "^1.4.16",
-    "@backstage/plugin-search-react": "^1.8.0",
-    "@backstage/plugin-techdocs": "^1.10.9",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.14",
-    "@backstage/plugin-techdocs-react": "^1.2.8",
-    "@backstage/plugin-user-settings": "^0.8.12",
-    "@backstage/theme": "^0.5.7",
+    "@backstage/app-defaults": "^1.7.0",
+    "@backstage/catalog-model": "^1.7.5",
+    "@backstage/cli": "^0.34.3",
+    "@backstage/core-app-api": "^1.19.0",
+    "@backstage/core-components": "^0.18.0",
+    "@backstage/core-plugin-api": "^1.11.0",
+    "@backstage/integration-react": "^1.2.10",
+    "@backstage/plugin-api-docs": "^0.12.11",
+    "@backstage/plugin-catalog": "^1.31.3",
+    "@backstage/plugin-catalog-common": "^1.1.5",
+    "@backstage/plugin-catalog-graph": "^0.5.0",
+    "@backstage/plugin-catalog-import": "^0.13.5",
+    "@backstage/plugin-catalog-react": "^1.21.0",
+    "@backstage/plugin-notifications": "^0.5.9",
+    "@backstage/plugin-org": "^0.6.44",
+    "@backstage/plugin-permission-react": "^0.4.36",
+    "@backstage/plugin-scaffolder": "^1.34.1",
+    "@backstage/plugin-scaffolder-react": "^1.19.1",
+    "@backstage/plugin-search": "^1.4.30",
+    "@backstage/plugin-search-react": "^1.9.4",
+    "@backstage/plugin-signals": "^0.0.23",
+    "@backstage/plugin-techdocs": "^1.15.0",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.28",
+    "@backstage/plugin-techdocs-react": "^1.3.3",
+    "@backstage/plugin-user-settings": "^0.8.26",
+    "@backstage/theme": "^0.6.8",
+    "@backstage/ui": "^0.7.1",
     "@internal/backstage-plugin-scaffolder-entity-pickers": "workspace:^",
     "@internal/backstage-plugin-serverlessops-catalog": "workspace:^",
     "@material-ui/core": "^4.12.2",
@@ -46,11 +49,10 @@
     "react": "^18.0.2",
     "react-dom": "^18.0.2",
     "react-router": "^6.3.0",
-    "react-router-dom": "^6.3.0",
-    "react-use": "^17.2.4"
+    "react-router-dom": "^6.3.0"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.6.0",
+    "@backstage/test-utils": "^1.7.11",
     "@playwright/test": "^1.32.3",
     "@testing-library/dom": "^9.0.0",
     "@testing-library/jest-dom": "^6.0.0",

src/packages/app/src/App.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, waitFor } from '@testing-library/react';
 import App from './App';
 

src/packages/app/src/App.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { Navigate, Route } from 'react-router-dom';
 import { apiDocsPlugin, ApiExplorerPage } from '@backstage/plugin-api-docs';
 import {
@@ -36,6 +35,8 @@ import { AppRouter, FlatRoutes } from '@backstage/core-app-api';
 import { CatalogGraphPage } from '@backstage/plugin-catalog-graph';
 import { RequirePermission } from '@backstage/plugin-permission-react';
 import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common/alpha';
+import { NotificationsPage } from '@backstage/plugin-notifications';
+import { SignalsDisplay } from '@backstage/plugin-signals';
 import { ScaffolderFieldExtensions } from '@backstage/plugin-scaffolder-react';
 
 // Added imports
@@ -170,13 +171,15 @@ const routes = (
     </Route>
     <Route path="/settings" element={<UserSettingsPage />} />
     <Route path="/catalog-graph" element={<CatalogGraphPage />} />
+    <Route path="/notifications" element={<NotificationsPage />} />
   </FlatRoutes>
 );
 
 export default app.createRoot(
   <>
     <AlertDisplay />
     <OAuthRequestDialog />
+    <SignalsDisplay />
     <AppRouter>
       <Root>{routes}</Root>
     </AppRouter>

src/packages/app/src/components/Root/LogoFull.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { makeStyles } from '@material-ui/core';
 
 const useStyles = makeStyles({