fixup

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
2023-03-16 14:34:44 +01:00
parent e47e69eadf
commit 078069edf5
5 changed files with 107 additions and 11 deletions
@@ -34,10 +34,11 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
+    "@apollo/client": "^3.0.0",
+    "@apollo/server": "^4.0.0",
    "@backstage/catalog-model": "workspace:^",
    "@backstage/config": "workspace:^",
    "@backstage/types": "workspace:^",
-    "@apollo/server": "^4.0.0",
    "graphql": "^16.0.0",
    "graphql-modules": "^2.0.0",
    "graphql-tag": "^2.11.0",
@@ -22,7 +22,7 @@ import { ConfigReader } from '@backstage/config';
 import { ReaderEntity } from '../service/client';
 import { createLogger } from 'winston';
 import { setupRequestMockHandlers } from '@backstage/test-utils';
-import { gql } from 'apollo-server';
+import { gql } from '@apollo/client';
 import { Module, createApplication, testkit } from 'graphql-modules';

 describe('Catalog Module', () => {
@@ -33,13 +33,12 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
+    "@apollo/server": "^4.0.0",
    "@backstage/backend-common": "workspace:^",
    "@backstage/config": "workspace:^",
    "@backstage/plugin-catalog-graphql": "workspace:^",
    "@graphql-tools/schema": "^9.0.0",
    "@types/express": "^4.17.6",
-    "@apollo/server": "^4.0.0",
-    "@apollo/server": "^4.0.0",
    "express": "^4.17.1",
    "express-promise-router": "^4.1.0",
    "graphql": "^16.0.0",
@@ -19,7 +19,8 @@ import express from 'express';
 import Router from 'express-promise-router';
 import { Logger } from 'winston';
 import { createApplication } from 'graphql-modules';
-import { ApolloServer } from 'apollo-server-express';
+import { ApolloServer } from '@apollo/server';
+import { expressMiddleware } from '@apollo/server/express4';
 import { createModule as createCatalogModule } from '@backstage/plugin-catalog-graphql';
 import { Config } from '@backstage/config';
 import helmet from 'helmet';
@@ -61,8 +62,6 @@ export async function createRouter(
    response.json({ status: 'ok' });
  });

-  const apolloMiddleware = server.getMiddleware({ path: '/' });
-
  if (process.env.NODE_ENV === 'development')
    router.use(
      helmet.contentSecurityPolicy({
@@ -72,7 +71,7 @@ export async function createRouter(
      }),
    );

-  router.use(apolloMiddleware);
+  router.use(expressMiddleware(server));
  router.use(errorHandler());

  return router;
@@ -42,6 +42,42 @@ __metadata:
  languageName: node
  linkType: hard

+"@apollo/client@npm:^3.0.0":
+  version: 3.7.10
+  resolution: "@apollo/client@npm:3.7.10"
+  dependencies:
+    "@graphql-typed-document-node/core": ^3.1.1
+    "@wry/context": ^0.7.0
+    "@wry/equality": ^0.5.0
+    "@wry/trie": ^0.3.0
+    graphql-tag: ^2.12.6
+    hoist-non-react-statics: ^3.3.2
+    optimism: ^0.16.1
+    prop-types: ^15.7.2
+    response-iterator: ^0.2.6
+    symbol-observable: ^4.0.0
+    ts-invariant: ^0.10.3
+    tslib: ^2.3.0
+    zen-observable-ts: ^1.2.5
+  peerDependencies:
+    graphql: ^14.0.0 || ^15.0.0 || ^16.0.0
+    graphql-ws: ^5.5.5
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    subscriptions-transport-ws: ^0.9.0 || ^0.11.0
+  peerDependenciesMeta:
+    graphql-ws:
+      optional: true
+    react:
+      optional: true
+    react-dom:
+      optional: true
+    subscriptions-transport-ws:
+      optional: true
+  checksum: d74a68f8042e76e3a81990c79a89aefc07c8899d354f3b469591356508001005106bba0fa953652c3ec19756d44bdec6730ac98f62fa836bd76acbcb7eff42ce
+  languageName: node
+  linkType: hard
+
 "@apollo/explorer@npm:^2.0.0":
  version: 2.0.2
  resolution: "@apollo/explorer@npm:2.0.2"
@@ -5302,6 +5338,7 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@backstage/plugin-catalog-graphql@workspace:plugins/catalog-graphql"
  dependencies:
+    "@apollo/client": ^3.0.0
    "@apollo/server": ^4.0.0
    "@backstage/catalog-model": "workspace:^"
    "@backstage/cli": "workspace:^"
@@ -16348,6 +16385,33 @@ __metadata:
  languageName: node
  linkType: hard

+"@wry/context@npm:^0.7.0":
+  version: 0.7.0
+  resolution: "@wry/context@npm:0.7.0"
+  dependencies:
+    tslib: ^2.3.0
+  checksum: f4ff78023a0b949122037aae766232b7d2284dc415204d22d9ea6d7969ff8f5f29b18128bc9a40e68dc054c8a12b1bf5868a357fdb50c398c447290c3a5b0496
+  languageName: node
+  linkType: hard
+
+"@wry/equality@npm:^0.5.0":
+  version: 0.5.3
+  resolution: "@wry/equality@npm:0.5.3"
+  dependencies:
+    tslib: ^2.3.0
+  checksum: 7ea8ded51462911217183b93cc3ffbb4d18dc02a62d4a79e0d9983463739bf54106aaeb25649bf33168120bd044b61d135018bfcf4fefad8099c13eac9238aa6
+  languageName: node
+  linkType: hard
+
+"@wry/trie@npm:^0.3.0":
+  version: 0.3.2
+  resolution: "@wry/trie@npm:0.3.2"
+  dependencies:
+    tslib: ^2.3.0
+  checksum: 151d06b519e1ff1c3acf6ee6846161b1d7d50bbecd4c48e5cd1b05f9e37c30602aff02e88f20105f6e6c54ae4123f9c4eb7715044d7fd927d4ba4ec3e755cd36
+  languageName: node
+  linkType: hard
+
 "@xmldom/xmldom@npm:^0.7.0, @xmldom/xmldom@npm:^0.7.5, @xmldom/xmldom@npm:^0.7.6":
  version: 0.7.9
  resolution: "@xmldom/xmldom@npm:0.7.9"
@@ -24254,7 +24318,7 @@ __metadata:
  languageName: node
  linkType: hard

-"graphql-tag@npm:^2.11.0":
+"graphql-tag@npm:^2.11.0, graphql-tag@npm:^2.12.6":
  version: 2.12.6
  resolution: "graphql-tag@npm:2.12.6"
  dependencies:
@@ -30844,6 +30908,16 @@ __metadata:
  languageName: node
  linkType: hard

+"optimism@npm:^0.16.1":
+  version: 0.16.2
+  resolution: "optimism@npm:0.16.2"
+  dependencies:
+    "@wry/context": ^0.7.0
+    "@wry/trie": ^0.3.0
+  checksum: a98ed9a0b8ee2b031010222099b60860d52860bf8182889f2695a7cf2185f21aca59020f78e2b47c0ae7697843caa576798d792967314ff59f6aa7c5d9de7f3a
+  languageName: node
+  linkType: hard
+
 "optionator@npm:^0.8.1":
  version: 0.8.3
  resolution: "optionator@npm:0.8.3"
@@ -34407,6 +34481,13 @@ __metadata:
  languageName: node
  linkType: hard

+"response-iterator@npm:^0.2.6":
+  version: 0.2.6
+  resolution: "response-iterator@npm:0.2.6"
+  checksum: b0db3c0665a0d698d65512951de9623c086b9c84ce015a76076d4bd0bf733779601d0b41f0931d16ae38132fba29e1ce291c1f8e6550fc32daaa2dc3ab4f338d
+  languageName: node
+  linkType: hard
+
 "responselike@npm:^2.0.0":
  version: 2.0.0
  resolution: "responselike@npm:2.0.0"
@@ -36593,6 +36674,13 @@ __metadata:
  languageName: node
  linkType: hard

+"symbol-observable@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "symbol-observable@npm:4.0.0"
+  checksum: 212c7edce6186634d671336a88c0e0bbd626c2ab51ed57498dc90698cce541839a261b969c2a1e8dd43762133d47672e8b62e0b1ce9cf4157934ba45fd172ba8
+  languageName: node
+  linkType: hard
+
 "symbol-tree@npm:^3.2.4":
  version: 3.2.4
  resolution: "symbol-tree@npm:3.2.4"
@@ -37190,6 +37278,15 @@ __metadata:
  languageName: node
  linkType: hard

+"ts-invariant@npm:^0.10.3":
+  version: 0.10.3
+  resolution: "ts-invariant@npm:0.10.3"
+  dependencies:
+    tslib: ^2.1.0
+  checksum: bb07d56fe4aae69d8860e0301dfdee2d375281159054bc24bf1e49e513fb0835bf7f70a11351344d213a79199c5e695f37ebbf5a447188a377ce0cd81d91ddb5
+  languageName: node
+  linkType: hard
+
 "ts-log@npm:^2.2.3":
  version: 2.2.3
  resolution: "ts-log@npm:2.2.3"
@@ -37278,7 +37375,7 @@ __metadata:
  languageName: node
  linkType: hard

-"tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.4.1, tslib@npm:~2.5.0":
+"tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.4.1, tslib@npm:~2.5.0":
  version: 2.5.0
  resolution: "tslib@npm:2.5.0"
  checksum: ae3ed5f9ce29932d049908ebfdf21b3a003a85653a9a140d614da6b767a93ef94f460e52c3d787f0e4f383546981713f165037dc2274df212ea9f8a4541004e1
@@ -39354,7 +39451,7 @@ __metadata:
  languageName: node
  linkType: hard

-"zen-observable-ts@npm:^1.1.0":
+"zen-observable-ts@npm:^1.1.0, zen-observable-ts@npm:^1.2.5":
  version: 1.2.5
  resolution: "zen-observable-ts@npm:1.2.5"
  dependencies: