ocir - version:bump to v1.39.1 (#917)

invincibleJai · web-flow · commit 2ac5cf59baee · 2025-06-06T11:54:37.000-04:00
diff --git a/workspaces/openshift-image-registry/.auto-version-bump b/workspaces/openshift-image-registry/.auto-version-bump
diff --git a/workspaces/openshift-image-registry/.changeset/selfish-rivers-sneeze.md b/workspaces/openshift-image-registry/.changeset/selfish-rivers-sneeze.md
@@ -0,0 +1,5 @@
+---
+'@red-hat-developer-hub/backstage-plugin-openshift-image-registry': minor
+---
+
+Backstage version bump to v1.39.1
diff --git a/workspaces/openshift-image-registry/README.md b/workspaces/openshift-image-registry/README.md
@@ -6,7 +6,7 @@ To start the app, run:
 
 ```sh
 yarn install
-yarn dev
+yarn start
 ```
 
 To generate knip reports for this app, run:
diff --git a/workspaces/openshift-image-registry/app-config.yaml b/workspaces/openshift-image-registry/app-config.yaml
@@ -32,6 +32,17 @@ backend:
     connection: ':memory:'
   # workingDirectory: /tmp # Use this to configure a working directory for the scaffolder, defaults to the OS temp-dir
 
+# Reference documentation http://backstage.io/docs/features/techdocs/configuration
+# Note: After experimenting with basic setup, use CI/CD to generate docs
+# and an external cloud storage when deploying TechDocs for production use-case.
+# https://backstage.io/docs/features/techdocs/how-to-guides#how-to-migrate-from-techdocs-basic-to-recommended-deployment-approach
+techdocs:
+  builder: 'local' # Alternatives - 'external'
+  generator:
+    runIn: 'docker' # Alternatives - 'local'
+  publisher:
+    type: 'local' # Alternatives - 'googleGcs' or 'awsS3'. Read documentation for using alternatives.
+
 # You can also copy this section into a file called app-config.local.yaml
 # and fill in the values.
 proxy:
diff --git a/workspaces/openshift-image-registry/backstage.json b/workspaces/openshift-image-registry/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.36.1"
+  "version": "1.39.1"
 }
diff --git a/workspaces/openshift-image-registry/package.json b/workspaces/openshift-image-registry/package.json
@@ -8,7 +8,7 @@
   "scripts": {
     "tsc": "tsc",
     "tsc:full": "tsc --skipLibCheck true --incremental false",
-    "dev": "yarn workspaces foreach -A --include backend --include app --parallel -v -i run start",
+    "start": "backstage-cli repo start",
     "build:all": "backstage-cli repo build --all",
     "build:api-reports": "yarn build:api-reports:only",
     "build:api-reports:only": "backstage-repo-tools api-reports -o ae-wrong-input-file-type --validate-release-tags",
@@ -34,9 +34,9 @@
     "directory": "workspaces/openshift-image-registry"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.30.0",
+    "@backstage/cli": "^0.32.1",
     "@backstage/e2e-test-utils": "^0.1.1",
-    "@backstage/repo-tools": "^0.13.0",
+    "@backstage/repo-tools": "^0.13.4",
     "@changesets/cli": "^2.27.1",
     "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
     "@spotify/prettier-config": "^12.0.0",
diff --git a/workspaces/openshift-image-registry/packages/app/package.json b/workspaces/openshift-image-registry/packages/app/package.json
@@ -19,29 +19,29 @@
     "lint": "backstage-cli package lint"
   },
   "dependencies": {
-    "@backstage/app-defaults": "^1.5.17",
-    "@backstage/catalog-model": "^1.7.3",
-    "@backstage/cli": "^0.30.0",
-    "@backstage/core-app-api": "^1.15.5",
-    "@backstage/core-components": "^0.16.4",
-    "@backstage/core-plugin-api": "^1.10.4",
-    "@backstage/integration-react": "^1.2.4",
-    "@backstage/plugin-api-docs": "^0.12.4",
-    "@backstage/plugin-catalog": "^1.27.0",
-    "@backstage/plugin-catalog-common": "^1.1.3",
-    "@backstage/plugin-catalog-graph": "^0.4.16",
-    "@backstage/plugin-catalog-import": "^0.12.10",
-    "@backstage/plugin-catalog-react": "^1.15.2",
-    "@backstage/plugin-org": "^0.6.36",
-    "@backstage/plugin-permission-react": "^0.4.31",
-    "@backstage/plugin-scaffolder": "^1.28.0",
-    "@backstage/plugin-search": "^1.4.23",
-    "@backstage/plugin-search-react": "^1.8.6",
-    "@backstage/plugin-techdocs": "^1.12.3",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.21",
-    "@backstage/plugin-techdocs-react": "^1.2.14",
-    "@backstage/plugin-user-settings": "^0.8.19",
-    "@backstage/theme": "^0.6.4",
+    "@backstage/app-defaults": "^1.6.2",
+    "@backstage/catalog-model": "^1.7.4",
+    "@backstage/cli": "^0.32.1",
+    "@backstage/core-app-api": "^1.17.0",
+    "@backstage/core-components": "^0.17.2",
+    "@backstage/core-plugin-api": "^1.10.7",
+    "@backstage/integration-react": "^1.2.7",
+    "@backstage/plugin-api-docs": "^0.12.7",
+    "@backstage/plugin-catalog": "^1.30.0",
+    "@backstage/plugin-catalog-common": "^1.1.4",
+    "@backstage/plugin-catalog-graph": "^0.4.19",
+    "@backstage/plugin-catalog-import": "^0.13.0",
+    "@backstage/plugin-catalog-react": "^1.18.0",
+    "@backstage/plugin-org": "^0.6.39",
+    "@backstage/plugin-permission-react": "^0.4.34",
+    "@backstage/plugin-scaffolder": "^1.31.0",
+    "@backstage/plugin-search": "^1.4.26",
+    "@backstage/plugin-search-react": "^1.9.0",
+    "@backstage/plugin-techdocs": "^1.12.6",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.24",
+    "@backstage/plugin-techdocs-react": "^1.2.17",
+    "@backstage/plugin-user-settings": "^0.8.22",
+    "@backstage/theme": "^0.6.6",
     "@mui/icons-material": "5.17.1",
     "@mui/lab": "5.0.0-alpha.176",
     "@mui/material": "5.17.1",
@@ -56,7 +56,7 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.7.5",
+    "@backstage/test-utils": "^1.7.8",
     "@playwright/test": "1.52.0",
     "@testing-library/dom": "^9.0.0",
     "@testing-library/jest-dom": "^6.0.0",
diff --git a/workspaces/openshift-image-registry/packages/app/src/App.test.tsx b/workspaces/openshift-image-registry/packages/app/src/App.test.tsx
@@ -15,7 +15,6 @@
  */
 
 import { render, waitFor } from '@testing-library/react';
-import React from 'react';
 import App from './App';
 
 describe('App', () => {
diff --git a/workspaces/openshift-image-registry/packages/app/src/App.tsx b/workspaces/openshift-image-registry/packages/app/src/App.tsx
@@ -48,7 +48,6 @@ import { TechDocsAddons } from '@backstage/plugin-techdocs-react';
 import { UserSettingsPage } from '@backstage/plugin-user-settings';
 import { OpenshiftImageRegistryPage } from '@red-hat-developer-hub/backstage-plugin-openshift-image-registry';
 import { getThemes } from '@red-hat-developer-hub/backstage-plugin-theme';
-import React from 'react';
 import { Navigate, Route } from 'react-router-dom';
 import { apis } from './apis';
 import { entityPage } from './components/catalog/EntityPage';
diff --git a/workspaces/openshift-image-registry/packages/app/src/components/Root/LogoFull.tsx b/workspaces/openshift-image-registry/packages/app/src/components/Root/LogoFull.tsx
@@ -15,7 +15,6 @@
  */
 
 import { makeStyles } from '@mui/styles';
-import React from 'react';
 
 const useStyles = makeStyles({
   svg: {
diff --git a/workspaces/openshift-image-registry/packages/app/src/components/Root/LogoIcon.tsx b/workspaces/openshift-image-registry/packages/app/src/components/Root/LogoIcon.tsx
@@ -15,7 +15,6 @@
  */
 
 import { makeStyles } from '@mui/styles';
-import React from 'react';
 
 const useStyles = makeStyles({
   svg: {
diff --git a/workspaces/openshift-image-registry/packages/app/src/components/Root/Root.tsx b/workspaces/openshift-image-registry/packages/app/src/components/Root/Root.tsx
@@ -40,7 +40,7 @@ import MenuIcon from '@mui/icons-material/Menu';
 import GroupIcon from '@mui/icons-material/People';
 import SearchIcon from '@mui/icons-material/Search';
 import { makeStyles } from '@mui/styles';
-import React, { PropsWithChildren } from 'react';
+import { PropsWithChildren } from 'react';
 import LogoFull from './LogoFull';
 import LogoIcon from './LogoIcon';
 
diff --git a/workspaces/openshift-image-registry/packages/app/src/components/catalog/EntityPage.tsx b/workspaces/openshift-image-registry/packages/app/src/components/catalog/EntityPage.tsx
@@ -68,7 +68,6 @@ import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib';
 import { TechDocsAddons } from '@backstage/plugin-techdocs-react';
 import Button from '@mui/material/Button';
 import Grid from '@mui/material/Grid';
-import React from 'react';
 
 const techdocsContent = (
   <EntityTechdocsContent>
diff --git a/workspaces/openshift-image-registry/packages/app/src/components/search/SearchPage.tsx b/workspaces/openshift-image-registry/packages/app/src/components/search/SearchPage.tsx
@@ -40,7 +40,6 @@ import Grid from '@mui/material/Grid';
 import Paper from '@mui/material/Paper';
 import { Theme } from '@mui/material/styles';
 import { makeStyles } from '@mui/styles';
-import React from 'react';
 
 const useStyles = makeStyles((theme: Theme) => ({
   bar: {
diff --git a/workspaces/openshift-image-registry/packages/app/src/index.tsx b/workspaces/openshift-image-registry/packages/app/src/index.tsx
@@ -15,7 +15,6 @@
  */
 
 import '@backstage/cli/asset-types';
-import React from 'react';
 import ReactDOM from 'react-dom/client';
 import App from './App';
 
diff --git a/workspaces/openshift-image-registry/packages/backend/package.json b/workspaces/openshift-image-registry/packages/backend/package.json
@@ -21,36 +21,36 @@
     "build-image": "docker build ../.. -f Dockerfile --tag backstage"
   },
   "dependencies": {
-    "@backstage/backend-defaults": "^0.8.1",
+    "@backstage/backend-defaults": "^0.10.0",
     "@backstage/config": "^1.3.2",
-    "@backstage/plugin-app-backend": "^0.4.5",
-    "@backstage/plugin-auth-backend": "^0.24.3",
-    "@backstage/plugin-auth-backend-module-github-provider": "^0.3.0",
-    "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.5",
-    "@backstage/plugin-auth-node": "^0.6.0",
-    "@backstage/plugin-catalog-backend": "^1.31.0",
-    "@backstage/plugin-catalog-backend-module-logs": "^0.1.7",
-    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.5",
-    "@backstage/plugin-permission-backend": "^0.5.54",
-    "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.5",
-    "@backstage/plugin-permission-common": "^0.8.4",
-    "@backstage/plugin-permission-node": "^0.8.8",
-    "@backstage/plugin-proxy-backend": "^0.5.11",
-    "@backstage/plugin-scaffolder-backend": "^1.30.0",
-    "@backstage/plugin-search-backend": "^1.8.2",
-    "@backstage/plugin-search-backend-module-catalog": "^0.3.1",
-    "@backstage/plugin-search-backend-module-pg": "^0.5.41",
-    "@backstage/plugin-search-backend-module-techdocs": "^0.3.6",
-    "@backstage/plugin-search-backend-node": "^1.3.8",
-    "@backstage/plugin-techdocs-backend": "^1.11.6",
+    "@backstage/plugin-app-backend": "^0.5.2",
+    "@backstage/plugin-auth-backend": "^0.25.0",
+    "@backstage/plugin-auth-backend-module-github-provider": "^0.3.3",
+    "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.8",
+    "@backstage/plugin-auth-node": "^0.6.3",
+    "@backstage/plugin-catalog-backend": "^2.0.0",
+    "@backstage/plugin-catalog-backend-module-logs": "^0.1.10",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.8",
+    "@backstage/plugin-permission-backend": "^0.7.0",
+    "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.8",
+    "@backstage/plugin-permission-common": "^0.9.0",
+    "@backstage/plugin-permission-node": "^0.10.0",
+    "@backstage/plugin-proxy-backend": "^0.6.2",
+    "@backstage/plugin-scaffolder-backend": "^1.33.0",
+    "@backstage/plugin-search-backend": "^2.0.2",
+    "@backstage/plugin-search-backend-module-catalog": "^0.3.4",
+    "@backstage/plugin-search-backend-module-pg": "^0.5.44",
+    "@backstage/plugin-search-backend-module-techdocs": "^0.4.2",
+    "@backstage/plugin-search-backend-node": "^1.3.11",
+    "@backstage/plugin-techdocs-backend": "^2.0.2",
     "app": "link:../app",
     "better-sqlite3": "^9.0.0",
     "node-gyp": "^10.0.0",
     "pg": "^8.11.3",
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.30.0",
+    "@backstage/cli": "^0.32.1",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",
     "@types/luxon": "^2.0.4"
diff --git a/workspaces/openshift-image-registry/packages/backend/src/index.ts b/workspaces/openshift-image-registry/packages/backend/src/index.ts
@@ -18,10 +18,10 @@ import { createBackend } from '@backstage/backend-defaults';
 
 const backend = createBackend();
 
-backend.add(import('@backstage/plugin-app-backend/alpha'));
-backend.add(import('@backstage/plugin-proxy-backend/alpha'));
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
-backend.add(import('@backstage/plugin-techdocs-backend/alpha'));
+backend.add(import('@backstage/plugin-app-backend'));
+backend.add(import('@backstage/plugin-proxy-backend'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
+backend.add(import('@backstage/plugin-techdocs-backend'));
 
 // auth plugin
 backend.add(import('@backstage/plugin-auth-backend'));
@@ -31,7 +31,7 @@ backend.add(import('@backstage/plugin-auth-backend-module-guest-provider'));
 backend.add(import('@backstage/plugin-auth-backend-module-github-provider'));
 
 // catalog plugin
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 backend.add(
   import('@backstage/plugin-catalog-backend-module-scaffolder-entity-model'),
 );
@@ -56,6 +56,6 @@ backend.add(import('@backstage/plugin-search-backend-module-pg/alpha'));
 
 // search collators
 backend.add(import('@backstage/plugin-search-backend-module-catalog'));
-backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha'));
+backend.add(import('@backstage/plugin-search-backend-module-techdocs'));
 
 backend.start();
diff --git a/workspaces/openshift-image-registry/plugins/openshift-image-registry/dev/index.tsx b/workspaces/openshift-image-registry/plugins/openshift-image-registry/dev/index.tsx
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import React from 'react';
-
 import { createDevApp } from '@backstage/dev-utils';
 import { TestApiProvider } from '@backstage/test-utils';
 
diff --git a/workspaces/openshift-image-registry/plugins/openshift-image-registry/package.json b/workspaces/openshift-image-registry/plugins/openshift-image-registry/package.json
@@ -36,9 +36,9 @@
     "prettier:fix": "prettier --ignore-unknown --write ."
   },
   "dependencies": {
-    "@backstage/core-components": "^0.16.4",
-    "@backstage/core-plugin-api": "^1.10.4",
-    "@backstage/theme": "^0.6.4",
+    "@backstage/core-components": "^0.17.2",
+    "@backstage/core-plugin-api": "^1.10.7",
+    "@backstage/theme": "^0.6.6",
     "@emotion/styled": "^11.13.0",
     "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
     "@janus-idp/shared-react": "2.18.0",
@@ -53,10 +53,10 @@
     "react-router-dom": "^6.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.30.0",
-    "@backstage/core-app-api": "^1.15.5",
-    "@backstage/dev-utils": "^1.1.7",
-    "@backstage/test-utils": "^1.7.5",
+    "@backstage/cli": "^0.32.1",
+    "@backstage/core-app-api": "^1.17.0",
+    "@backstage/dev-utils": "^1.1.10",
+    "@backstage/test-utils": "^1.7.8",
     "@janus-idp/cli": "1.19.1",
     "@mui/icons-material": "^6.1.6",
     "@red-hat-developer-hub/backstage-plugin-theme": "^0.8.0",
diff --git a/workspaces/openshift-image-registry/plugins/openshift-image-registry/report.api.md b/workspaces/openshift-image-registry/plugins/openshift-image-registry/report.api.md
@@ -4,10 +4,8 @@
 
 ```ts
 
-/// <reference types="react" />
-
 import { BackstagePlugin } from '@backstage/core-plugin-api';
-import { JSX as JSX_2 } from 'react';
+import { JSX as JSX_2 } from 'react/jsx-runtime';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public
diff --git a/workspaces/openshift-image-registry/plugins/openshift-image-registry/src/components/OcirImages/OcirImageSearchBar.tsx b/workspaces/openshift-image-registry/plugins/openshift-image-registry/src/components/OcirImages/OcirImageSearchBar.tsx
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import React from 'react';
+import { useState } from 'react';
+import type { Dispatch, SetStateAction } from 'react';
 import useDebounce from 'react-use/lib/useDebounce';
 
 import {
@@ -40,9 +41,7 @@ const useStyles = makeStyles(_theme => ({
 
 type OcirImageSearchBarProps = {
   imageStreams: ImageStreamMetadata[];
-  setImageStreams: React.Dispatch<
-    React.SetStateAction<ImageStreamMetadata[] | undefined>
-  >;
+  setImageStreams: Dispatch<SetStateAction<ImageStreamMetadata[] | undefined>>;
 };
 
 export const OcirImageSearchBar = ({
@@ -51,7 +50,7 @@ export const OcirImageSearchBar = ({
 }: OcirImageSearchBarProps) => {
   const classes = useStyles();
 
-  const [search, setSearch] = React.useState<string>('');
+  const [search, setSearch] = useState<string>('');
 
   const searchByName = () => {
     const filteredImageStreams = imageStreams
diff --git a/workspaces/openshift-image-registry/plugins/openshift-image-registry/src/components/OcirImages/OcirImageSidebar.tsx b/workspaces/openshift-image-registry/plugins/openshift-image-registry/src/components/OcirImages/OcirImageSidebar.tsx
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import React from 'react';
-
 import { CopyTextButton, MarkdownContent } from '@backstage/core-components';
 
 import {
diff --git a/workspaces/openshift-image-registry/plugins/openshift-image-registry/src/components/OcirImages/OcirImagesCard.tsx b/workspaces/openshift-image-registry/plugins/openshift-image-registry/src/components/OcirImages/OcirImagesCard.tsx
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import React from 'react';
-
 import {
   ItemCardHeader,
   LinkButton,
diff --git a/workspaces/openshift-image-registry/plugins/openshift-image-registry/src/components/OcirImages/OcirImagesCards.tsx b/workspaces/openshift-image-registry/plugins/openshift-image-registry/src/components/OcirImages/OcirImagesCards.tsx
diff --git a/workspaces/openshift-image-registry/plugins/openshift-image-registry/src/components/OcirImages/OcirImagesView.tsx b/workspaces/openshift-image-registry/plugins/openshift-image-registry/src/components/OcirImages/OcirImagesView.tsx
diff --git a/workspaces/openshift-image-registry/plugins/openshift-image-registry/src/components/OcirPage/OcirPage.tsx b/workspaces/openshift-image-registry/plugins/openshift-image-registry/src/components/OcirPage/OcirPage.tsx
diff --git a/workspaces/openshift-image-registry/tsconfig.json b/workspaces/openshift-image-registry/tsconfig.json
diff --git a/workspaces/openshift-image-registry/yarn.lock b/workspaces/openshift-image-registry/yarn.lock

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@red-hat-developer-hub/backstage-plugin-openshift-image-registry': minor
 +---
++
 +Backstage version bump to v1.39.1
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "version": "1.36.1"`
	`2`	`+ "version": "1.39.1"`
`3`	`3`	`}`