Skip to content

Commit

Permalink
things work on startup
Browse files Browse the repository at this point in the history
  • Loading branch information
lgandecki committed Aug 4, 2023
1 parent 3851d4f commit e0ba51c
Show file tree
Hide file tree
Showing 8 changed files with 585 additions and 18,231 deletions.
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { pathsToModuleNameMapper } = require("ts-jest/utils");
const { compilerOptions } = require("./tsconfig");
const { pathsToModuleNameMapper } = require("ts-jest");

module.exports = {
preset: "ts-jest",
Expand Down
1,314 changes: 551 additions & 763 deletions package-lock.json

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"@apollo/server": "^4.9.0",
"@apollo/subgraph": "^2.5.1",
"@types/cors": "^2.8.13",
"body-parser": "^1.20.2",
"cookie-parser": "1.4.5",
"cors": "^2.8.5",
"express": "4.17.1",
Expand All @@ -51,7 +52,9 @@
"@graphql-tools/merge": "9.0.0",
"@jest/globals": "26.1.0",
"@tsconfig/node18": "^18.2.0",
"@types/body-parser": "^1.19.2",
"@types/cookie-parser": "^1.4.3",
"@types/express": "^4.17.17",
"@types/jest": "29.4.0",
"@types/lodash": "^4.14.196",
"@types/lokijs": "^1.5.8",
Expand All @@ -67,15 +70,15 @@
"eslint-import-resolver-typescript": "3.5.5",
"eslint-plugin-import": "2.28.0",
"eslint-plugin-prettier": "5.0.0",
"jest": "29.4.0",
"jest": "29.6.2",
"lint-staged": "10.2.11",
"nodemon": "2.0.4",
"prettier": "3.0.1",
"shelljs": "0.8.5",
"testdouble": "3.18.0",
"testdouble-jest": "2.0.0",
"ts-jest": "29.0.5",
"ts-node": "8.10.2",
"ts-jest": "29.1.1",
"ts-node": "10.9.1",
"typescript": "5.1.6"
}
}
20 changes: 20 additions & 0 deletions patches/chimp+5.0.0.patch
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,23 @@ index 120045a..16c7828 100644
cwd: projectMainPath,
});
};
diff --git a/node_modules/chimp/lib/generate/templates/schema.ts b/node_modules/chimp/lib/generate/templates/schema.ts
index c8cb587..93a9299 100644
--- a/node_modules/chimp/lib/generate/templates/schema.ts
+++ b/node_modules/chimp/lib/generate/templates/schema.ts
@@ -2,13 +2,13 @@

// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
// @ts-ignore
-import { buildFederatedSchema } from '@apollo/federation';
+import { buildSubgraphSchema } from '@apollo/subgraph';
import { resolvers } from '{{generatedPrefix}}/graphql/resolvers';
import gql from 'graphql-tag';

const typeDefs = gql`{{{schemaString}}}`;

-const schema = buildFederatedSchema([
+const schema = buildSubgraphSchema([
{
typeDefs,
resolvers,
Loading

0 comments on commit e0ba51c

Please sign in to comment.