Skip to content

Commit

Permalink
Merge pull request #1152 from serlo/remove-graphql-modules
Browse files Browse the repository at this point in the history
chore: Merge package "graphql-modules" into "server"
  • Loading branch information
hugotiburtino authored Dec 1, 2023
2 parents aeea830 + 0dae132 commit 070d4df
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 32 deletions.
4 changes: 0 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ updates:
directory: 'packages/authorization'
schedule:
interval: 'weekly'
- package-ecosystem: 'npm'
directory: 'packages/graphql-modules'
schedule:
interval: 'weekly'
- package-ecosystem: 'npm'
directory: 'packages/server'
schedule:
Expand Down
7 changes: 0 additions & 7 deletions packages/graphql-modules/index.d.ts

This file was deleted.

9 changes: 0 additions & 9 deletions packages/graphql-modules/package.json

This file was deleted.

2 changes: 0 additions & 2 deletions packages/server/docker/server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ 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 package.json .
COPY lerna.json .
Expand All @@ -16,7 +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
RUN yarn build:server

FROM base as build_node_modules
Expand Down
2 changes: 0 additions & 2 deletions packages/server/docker/swr-queue-worker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ 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 package.json .
COPY lerna.json .
Expand All @@ -16,7 +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
RUN yarn build:swr-queue-worker

FROM base as build_node_modules
Expand Down
1 change: 0 additions & 1 deletion packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 8 additions & 0 deletions packages/server/src/typings.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
7 changes: 0 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4099,7 +4099,6 @@ __metadata:
"@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
Expand Down Expand Up @@ -4420,12 +4419,6 @@ __metadata:
languageName: node
linkType: hard

"@types/graphql-modules@^0.59.0, @types/graphql-modules@workspace:packages/graphql-modules":
version: 0.0.0-use.local
resolution: "@types/graphql-modules@workspace:packages/graphql-modules"
languageName: unknown
linkType: soft

"@types/ioredis@npm:^4.28.10":
version: 4.28.10
resolution: "@types/ioredis@npm:4.28.10"
Expand Down

0 comments on commit 070d4df

Please sign in to comment.