From 6f7d966c3b9ad5cce62cca67e78bb53c616c42be Mon Sep 17 00:00:00 2001
From: aramissennyeydd <aramis.sennyey@doordash.com>
Date: Mon, 7 Oct 2024 23:29:18 -0400
Subject: [PATCH] fix misc file changes

Signed-off-by: aramissennyeydd <aramis.sennyey@doordash.com>
---
 packages/catalog-client/package.json          |  4 +---
 .../src/generated/.openapi-generator-ignore   | 23 -------------------
 plugins/catalog-common/package.json           |  4 +---
 plugins/search-common/package.json            | 19 ++++-----------
 yarn.lock                                     |  5 ----
 5 files changed, 6 insertions(+), 49 deletions(-)
 delete mode 100644 packages/repo-tools/plugins/catalog-backend/src/generated/.openapi-generator-ignore

diff --git a/packages/catalog-client/package.json b/packages/catalog-client/package.json
index d5bfbda6a9..1e6501f470 100644
--- a/packages/catalog-client/package.json
+++ b/packages/catalog-client/package.json
@@ -37,8 +37,7 @@
     }
   },
   "files": [
-    "dist",
-    "alpha"
+    "dist"
   ],
   "scripts": {
     "build": "backstage-cli package build",
@@ -51,7 +50,6 @@
   "dependencies": {
     "@backstage/catalog-model": "workspace:^",
     "@backstage/errors": "workspace:^",
-    "@backstage/plugin-catalog-common": "workspace:^",
     "cross-fetch": "^4.0.0",
     "uri-template": "^2.0.0"
   },
diff --git a/packages/repo-tools/plugins/catalog-backend/src/generated/.openapi-generator-ignore b/packages/repo-tools/plugins/catalog-backend/src/generated/.openapi-generator-ignore
deleted file mode 100644
index 1b59086ab7..0000000000
--- a/packages/repo-tools/plugins/catalog-backend/src/generated/.openapi-generator-ignore
+++ /dev/null
@@ -1,23 +0,0 @@
-*.md
-apis/baseapi.ts
-apis/exception.ts
-auth/*
-http/*
-middleware.ts
-servers.ts
-util.ts
-configuration.ts
-rxjsStub.ts
-.gitignore
-apis/*.ts
-!apis/*.client.ts
-models/*.ts
-!models/*.model.ts
-!index.ts
-!**/index.ts
-types/ObjectParamAPI.ts
-types/ObservableAPI.ts
-types/PromiseAPI.ts
-git_push.sh
-package.json
-tsconfig.json
\ No newline at end of file
diff --git a/plugins/catalog-common/package.json b/plugins/catalog-common/package.json
index f38c238ca2..6e69dd0ef8 100644
--- a/plugins/catalog-common/package.json
+++ b/plugins/catalog-common/package.json
@@ -58,9 +58,7 @@
   "dependencies": {
     "@backstage/catalog-model": "workspace:^",
     "@backstage/plugin-permission-common": "workspace:^",
-    "@backstage/plugin-search-common": "workspace:^",
-    "cross-fetch": "^4.0.0",
-    "uri-template": "^2.0.0"
+    "@backstage/plugin-search-common": "workspace:^"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^"
diff --git a/plugins/search-common/package.json b/plugins/search-common/package.json
index eec177cec7..10524c1515 100644
--- a/plugins/search-common/package.json
+++ b/plugins/search-common/package.json
@@ -14,7 +14,9 @@
     ]
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "main": "dist/index.cjs.js",
+    "types": "dist/index.d.ts"
   },
   "keywords": [
     "backstage",
@@ -31,19 +33,8 @@
   },
   "license": "Apache-2.0",
   "sideEffects": false,
-  "exports": {
-    ".": "./src/index.ts",
-    "./package.json": "./package.json"
-  },
   "main": "src/index.ts",
   "types": "src/index.ts",
-  "typesVersions": {
-    "*": {
-      "package.json": [
-        "package.json"
-      ]
-    }
-  },
   "files": [
     "dist"
   ],
@@ -62,9 +53,7 @@
   },
   "dependencies": {
     "@backstage/plugin-permission-common": "workspace:^",
-    "@backstage/types": "workspace:^",
-    "cross-fetch": "^4.0.0",
-    "uri-template": "^2.0.0"
+    "@backstage/types": "workspace:^"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^"
diff --git a/yarn.lock b/yarn.lock
index ffe8cff6e8..ba52ed11df 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3860,7 +3860,6 @@ __metadata:
     "@backstage/catalog-model": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/errors": "workspace:^"
-    "@backstage/plugin-catalog-common": "workspace:^"
     cross-fetch: ^4.0.0
     msw: ^1.0.0
     uri-template: ^2.0.0
@@ -6070,8 +6069,6 @@ __metadata:
     "@backstage/cli": "workspace:^"
     "@backstage/plugin-permission-common": "workspace:^"
     "@backstage/plugin-search-common": "workspace:^"
-    cross-fetch: ^4.0.0
-    uri-template: ^2.0.0
   languageName: unknown
   linkType: soft
 
@@ -8040,8 +8037,6 @@ __metadata:
     "@backstage/cli": "workspace:^"
     "@backstage/plugin-permission-common": "workspace:^"
     "@backstage/types": "workspace:^"
-    cross-fetch: ^4.0.0
-    uri-template: ^2.0.0
   languageName: unknown
   linkType: soft