Merge pull request #1151 from serlo/remove-types-package

chore: Remove `@serlo/api`
serlo · Dec 1, 2023 · fc12961 · fc12961
2 parents 2a34c4b + 070d4df
commit fc12961
Show file tree

Hide file tree

Showing 18 changed files with 13 additions and 2,914 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -12,18 +12,10 @@ updates:
     directory: 'packages/authorization'
     schedule:
       interval: 'weekly'
-  - package-ecosystem: 'npm'
-    directory: 'packages/graphql-modules'
-    schedule:
-      interval: 'weekly'
   - package-ecosystem: 'npm'
     directory: 'packages/server'
     schedule:
       interval: 'weekly'
-  - package-ecosystem: 'npm'
-    directory: 'packages/types'
-    schedule:
-      interval: 'weekly'
 
   - package-ecosystem: 'docker'
     directory: 'packages/server/docker/server'

diff --git a/__tests__/schema/entity/checkout-revision.ts b/__tests__/schema/entity/checkout-revision.ts
@@ -1,4 +1,3 @@
-import { Instance } from '@serlo/api'
 import gql from 'graphql-tag'
 import { HttpResponse } from 'msw'
 
@@ -10,6 +9,7 @@ import {
 } from '../../../__fixtures__'
 import { getTypenameAndId, nextUuid, given, Client } from '../../__utils__'
 import { encodeSubjectId } from '~/schema/subject/utils'
+import { Instance } from '~/types'
 
 const user = { ...baseUser, roles: ['de_reviewer'] }
 const article = {

diff --git a/__tests__/schema/entity/reject-revision.ts b/__tests__/schema/entity/reject-revision.ts
@@ -1,4 +1,3 @@
-import { Instance } from '@serlo/api'
 import gql from 'graphql-tag'
 import { HttpResponse } from 'msw'
 
@@ -10,6 +9,7 @@ import {
 } from '../../../__fixtures__'
 import { given, getTypenameAndId, nextUuid, Client } from '../../__utils__'
 import { encodeSubjectId } from '~/schema/subject/utils'
+import { Instance } from '~/types'
 
 const user = { ...baseUser, roles: ['de_reviewer'] }
 const article = {

diff --git a/__tests__/schema/metadata.ts b/__tests__/schema/metadata.ts
@@ -1,7 +1,7 @@
-import { Instance } from '@serlo/api'
 import gql from 'graphql-tag'
 
 import { Client, given } from '../__utils__'
+import { Instance } from '~/types'
 
 test('endpoint `publisher` returns publisher', async () => {
   await new Client()

diff --git a/__tests__/schema/page/checkout-revision.ts b/__tests__/schema/page/checkout-revision.ts
@@ -1,4 +1,3 @@
-import { Instance } from '@serlo/api'
 import gql from 'graphql-tag'
 import { HttpResponse } from 'msw'
 
@@ -8,6 +7,7 @@ import {
   user as baseUser,
 } from '../../../__fixtures__'
 import { given, nextUuid, Client } from '../../__utils__'
+import { Instance } from '~/types'
 
 const user = { ...baseUser, roles: ['de_static_pages_builder'] }
 const page = {

diff --git a/__tests__/schema/page/reject-revision.ts b/__tests__/schema/page/reject-revision.ts
@@ -1,4 +1,3 @@
-import { Instance } from '@serlo/api'
 import gql from 'graphql-tag'
 import { HttpResponse } from 'msw'
 
@@ -8,6 +7,7 @@ import {
   user as baseUser,
 } from '../../../__fixtures__'
 import { given, nextUuid, Client } from '../../__utils__'
+import { Instance } from '~/types'
 
 const user = { ...baseUser, roles: ['de_static_pages_builder'] }
 const page = {

diff --git a/packages/graphql-modules/index.d.ts b/packages/graphql-modules/index.d.ts
diff --git a/packages/graphql-modules/package.json b/packages/graphql-modules/package.json
diff --git a/packages/server/docker/server/Dockerfile b/packages/server/docker/server/Dockerfile
@@ -6,9 +6,7 @@ COPY scripts/build.ts scripts/build.ts
 COPY tsconfig.json .
 COPY tsconfig.prod.json .
 COPY packages/authorization/package.json packages/authorization/package.json
-COPY packages/graphql-modules/package.json packages/graphql-modules/package.json
 COPY packages/server/package.json packages/server/package.json
-COPY packages/types/package.json packages/types/package.json
 COPY package.json .
 COPY lerna.json .
 COPY yarn.lock .
@@ -17,8 +15,6 @@ FROM base as build_dist
 RUN yarn --immutable --immutable-cache --silent
 COPY packages/authorization packages/authorization
 COPY packages/server packages/server
-COPY packages/graphql-modules packages/graphql-modules
-COPY packages/types packages/types
 RUN yarn build:server
 
 FROM base as build_node_modules

diff --git a/packages/server/docker/swr-queue-worker/Dockerfile b/packages/server/docker/swr-queue-worker/Dockerfile
@@ -6,9 +6,7 @@ COPY scripts/build.ts scripts/build.ts
 COPY tsconfig.json .
 COPY tsconfig.prod.json .
 COPY packages/authorization/package.json packages/authorization/package.json
-COPY packages/graphql-modules/package.json packages/graphql-modules/package.json
 COPY packages/server/package.json packages/server/package.json
-COPY packages/types/package.json packages/types/package.json
 COPY package.json .
 COPY lerna.json .
 COPY yarn.lock .
@@ -17,8 +15,6 @@ FROM base as build_dist
 RUN yarn --immutable --immutable-cache --silent
 COPY packages/authorization packages/authorization
 COPY packages/server packages/server
-COPY packages/graphql-modules packages/graphql-modules
-COPY packages/types packages/types
 RUN yarn build:swr-queue-worker
 
 FROM base as build_node_modules

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -35,7 +35,6 @@
     "@serlo/authorization": "^0.59.1",
     "@types/basic-auth": "^1.1.6",
     "@types/bull-arena": "^3.0.10",
-    "@types/graphql-modules": "^0.59.0",
     "@types/jsonwebtoken": "^9.0.5",
     "@types/pg": "^8.10.9",
     "@types/ramda": "^0.29.9",

diff --git a/packages/server/src/typings.d.ts b/packages/server/src/typings.d.ts
@@ -8,3 +8,11 @@
 declare module '*.json' {
   export const version: string
 }
+
+declare module '*.graphql' {
+  import { DocumentNode } from 'graphql'
+
+  const node: DocumentNode
+  // eslint-disable-next-line import/no-default-export
+  export default node
+}
diff --git a/packages/types/codegen.yml b/packages/types/codegen.yml
diff --git a/packages/types/package.json b/packages/types/package.json