move client to *-common/client

Signed-off-by: Aramis Sennyey <159921952+aramissennyeydd@users.noreply.github.com>
Signed-off-by: aramissennyeydd <aramis.sennyey@doordash.com>

packages/catalog-client/package.json

@@ -51,6 +51,7 @@
   "dependencies": {
     "@backstage/catalog-model": "workspace:^",
     "@backstage/errors": "workspace:^",
+    "@backstage/plugin-catalog-common": "workspace:^",
     "cross-fetch": "^4.0.0",
     "uri-template": "^2.0.0"
   },

plugins/catalog-backend/package.json

@@ -53,7 +53,7 @@
     "clean": "backstage-cli package clean",
     "diff": "backstage-repo-tools package schema openapi diff",
     "fuzz": "backstage-repo-tools package schema openapi fuzz --exclude-checks response_schema_conformance",
-    "generate": "backstage-repo-tools package schema openapi generate --server --client-package packages/catalog-client --server-client-import \"@backstage/catalog-client/alpha\"",
+    "generate": "backstage-repo-tools package schema openapi generate --server --client-package plugins/catalog-common --server-client-import \"@backstage/plugin-catalog-common/client\"",
     "lint": "backstage-cli package lint",
     "prepack": "backstage-cli package prepack",
     "postpack": "backstage-cli package postpack",

plugins/catalog-backend/src/generated/apis/DefaultApi.server.ts

@@ -34,7 +34,7 @@ import type {
   GetLocations,
   RefreshEntity,
   ValidateEntity,
-} from '@backstage/catalog-client/alpha';
+} from '@backstage/plugin-catalog-common/client';
 
 /**
  * no description

plugins/catalog-common/package.json

@@ -30,6 +30,7 @@
   "exports": {
     ".": "./src/index.ts",
     "./alpha": "./src/alpha.ts",
+    "./client": "./src/client.ts",
     "./package.json": "./package.json"
   },
   "main": "src/index.ts",
@@ -39,6 +40,9 @@
       "alpha": [
         "src/alpha.ts"
       ],
+      "client": [
+        "src/client.ts"
+      ],
       "package.json": [
         "package.json"
       ]
@@ -58,7 +62,9 @@
   "dependencies": {
     "@backstage/catalog-model": "workspace:^",
     "@backstage/plugin-permission-common": "workspace:^",
-    "@backstage/plugin-search-common": "workspace:^"
+    "@backstage/plugin-search-common": "workspace:^",
+    "cross-fetch": "^4.0.0",
+    "uri-template": "^2.0.0"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^"

plugins/catalog-common/src/client.ts

@@ -0,0 +1,17 @@
+/*
+ * 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.
+ */
+
+export * from './generated';

yarn.lock

@@ -3860,6 +3860,7 @@ __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,6 +6071,8 @@ __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