Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add core defs to in buildSubgraphSchema #1554

Merged
merged 38 commits into from
Apr 8, 2022
Merged

add core defs to in buildSubgraphSchema #1554

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
32c2a63
add core defs to in buildSubgraphSchema
Mar 2, 2022
c9e5e00
always emit core.
Mar 2, 2022
253af34
appears to work, diffing snapshots
Mar 3, 2022
b13ddad
update tests, all subgraph-js tests passing
Mar 3, 2022
3182670
Merge remote-tracking branch 'origin/main' into subgraph-core
Mar 9, 2022
9afb2bd
merging
Mar 24, 2022
5a418a5
update tests
Mar 24, 2022
22679f8
remove router bridge
Mar 24, 2022
9c350b3
link @apollo/core-schema to upcoming branch
Mar 25, 2022
d9900fd
remove unneeded tests
Mar 25, 2022
75f6ac4
remove old import, update snapshots
Mar 28, 2022
40ff218
update package-lock, refs
Mar 28, 2022
b9649ba
update package-lock
Mar 28, 2022
a0468c4
directly print subgraph ast
Mar 29, 2022
10f32a6
only printSubgraphSchema tests failing
Mar 29, 2022
b778c1e
remove printSubgraphSchema
Mar 29, 2022
76468ef
test core composition failure
Mar 29, 2022
f0934da
composeServices still broken
Mar 29, 2022
5f57fc2
remove printSubgraphSchema from exports
Mar 29, 2022
de7470c
Fix handling of core/link when definitions are provided or partially so
Mar 30, 2022
bb7b7de
merge core fix
Mar 30, 2022
5e00cd2
support link v0.3
Mar 30, 2022
1daa2af
fix commit change markers
Mar 30, 2022
2198bef
tests passing
Mar 30, 2022
853bc8f
update package-lock.json
Mar 31, 2022
fbe32b8
update tests
Apr 6, 2022
0ea9530
do not emit core markings if there aren't already some in the document
Apr 6, 2022
6ec1ea1
merge main
Apr 6, 2022
b04c068
update atlas and tests
Apr 6, 2022
4319ca8
remove dead code, update atlas
Apr 6, 2022
0dc4d01
update atlas to remove transitive links
Apr 6, 2022
510eac7
update atlas and tests again, missed a link
Apr 7, 2022
808c53e
update comment and use new dangerous method from core-schema library …
Apr 7, 2022
f0f23e1
add a test to ensure directives are passed through
Apr 7, 2022
adf0aa1
point to core-schema v0.3 on npm, update package-lock
Apr 8, 2022
22acde4
restore descriptive text
Apr 8, 2022
e28f31c
merging main
Apr 8, 2022
ad45d01
restore printSubgraphSchema
Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,6 @@ node_modules/

# Local Netlify folder
.netlify

# router build artifact
router-bridge
1 change: 0 additions & 1 deletion gateway-js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
},
"dependencies": {
"@apollo/composition": "file:../composition-js",
"@apollo/core-schema": "^0.2.2",
"@apollo/query-planner": "file:../query-planner-js",
"@josephg/resolvable": "^1.0.1",
"@opentelemetry/api": "^1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion internals-js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"node": ">=12.13.0 <17.0"
},
"dependencies": {
"@apollo/core-schema": "^0.2.2",
"@apollo/core-schema": "https://github.com/apollographql/core-schema-js#link-import",
"chalk": "^4.1.0",
"js-levenshtein": "^1.1.6"
},
Expand Down
105 changes: 92 additions & 13 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions subgraph-js/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,8 @@ module.exports = {
name: "@apollo/subgraph",
color: "blue",
},
snapshotSerializers: [
'@apollo/core-schema/dist/snapshot-serializers/ast',
'@apollo/core-schema/dist/snapshot-serializers/raw',
]
};
6 changes: 6 additions & 0 deletions subgraph-js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
"engines": {
"node": ">=12.13.0 <17.0"
},
"dependencies": {
"@apollo/core-schema": "https://github.com/apollographql/core-schema-js#link-import"
},
"devDependencies": {
"@protoplasm/recall": "^0.1.0"
},
"publishConfig": {
"access": "public"
},
Expand Down
Loading