Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into translation-perf
Browse files Browse the repository at this point in the history
  • Loading branch information
angrykoala committed May 3, 2023
2 parents df1a173 + e6400df commit cbf1786
Show file tree
Hide file tree
Showing 580 changed files with 1,762 additions and 12,599 deletions.
5 changes: 5 additions & 0 deletions .changeset/fluffy-pillows-flow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@neo4j/graphql": patch
---

Federation: Setting `@key` resolvable to false no longer prevents queries and mutations for a type from being generated.
2 changes: 1 addition & 1 deletion .github/workflows/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
repo-token: ${{ secrets.NEO4J_TEAM_GRAPHQL_PERSONAL_ACCESS_TOKEN }}
action: add
- name: Add comment
uses: peter-evans/create-or-update-comment@3383acd359705b10cb1eeef05c0e88c056ea4666 # v3.0.0
uses: peter-evans/create-or-update-comment@ca08ebd5dc95aa0cd97021e9708fcd6b87138c9b # v3.0.1
with:
token: ${{ secrets.NEO4J_TEAM_GRAPHQL_PERSONAL_ACCESS_TOKEN }}
issue-number: ${{ github.event.issue.number }}
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ on:
- cron: "0 3 * * *"

jobs:
# Let's consider the value of testing examples
# Perhaps we need some newer, better examples for testing
neo-push-tests:
uses: ./.github/workflows/reusable-neo-push-tests.yml

code-scanning:
uses: ./.github/workflows/reusable-codeql-analysis.yml

Expand Down Expand Up @@ -63,7 +58,6 @@ jobs:
runs-on: ubuntu-latest

needs:
- neo-push-tests
- code-scanning
- unit-tests
- api-library-tests
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/issue-labeled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
repo-token: ${{ secrets.NEO4J_TEAM_GRAPHQL_PERSONAL_ACCESS_TOKEN }}
action: add
- name: Add comment
uses: peter-evans/create-or-update-comment@3383acd359705b10cb1eeef05c0e88c056ea4666 # v3.0.0
uses: peter-evans/create-or-update-comment@ca08ebd5dc95aa0cd97021e9708fcd6b87138c9b # v3.0.1
with:
token: ${{ secrets.NEO4J_TEAM_GRAPHQL_PERSONAL_ACCESS_TOKEN }}
issue-number: ${{ github.event.issue.number }}
Expand All @@ -40,7 +40,7 @@ jobs:

steps:
- name: Add comment
uses: peter-evans/create-or-update-comment@3383acd359705b10cb1eeef05c0e88c056ea4666 # v3.0.0
uses: peter-evans/create-or-update-comment@ca08ebd5dc95aa0cd97021e9708fcd6b87138c9b # v3.0.1
with:
token: ${{ secrets.NEO4J_TEAM_GRAPHQL_PERSONAL_ACCESS_TOKEN }}
issue-number: ${{ github.event.issue.number }}
Expand All @@ -58,7 +58,7 @@ jobs:

steps:
- name: Add comment
uses: peter-evans/create-or-update-comment@3383acd359705b10cb1eeef05c0e88c056ea4666 # v3.0.0
uses: peter-evans/create-or-update-comment@ca08ebd5dc95aa0cd97021e9708fcd6b87138c9b # v3.0.1
with:
token: ${{ secrets.NEO4J_TEAM_GRAPHQL_PERSONAL_ACCESS_TOKEN }}
issue-number: ${{ github.event.issue.number }}
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/pull-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ jobs:
package-tests:
uses: ./.github/workflows/reusable-package-tests.yml

neo-push-tests:
uses: ./.github/workflows/reusable-neo-push-tests.yml

typescript-changes:
runs-on: ubuntu-latest

Expand Down Expand Up @@ -99,7 +96,6 @@ jobs:
- reviewdog-eslint
- code-scanning
- package-tests
- neo-push-tests
- license-header-check
- unit-tests
- e2e-tests-plugins
Expand Down
32 changes: 0 additions & 32 deletions .github/workflows/reusable-neo-push-tests.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/reusable-toolbox-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
cache: yarn
- name: Install dependencies
run: yarn install --frozen-lockfile
# To fail fast, build the Toolbox to see if any errors occur. For example, a common error is building referenced projects like the introspector.
- name: Build the GraphQL Toolbox
# the introspector is a referenced project by the Toolbox.
- name: Build the introspector
run: yarn build
working-directory: packages/graphql-toolbox
working-directory: packages/introspector
- name: Install Playwright
run: npx playwright install --with-deps
- name: Run @neo4j/graphql-toolbox unit tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yarn-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
echo "title=[YARN UPDATE] Update yarn $today" >> "$GITHUB_OUTPUT"
echo "branch=yarn-update-$today" >> "$GITHUB_OUTPUT"
- name: Create Pull Request
uses: peter-evans/create-pull-request@5b4a9f6a9e2af26e5f02351490b90d01eb8ec1e5 # v5.0.0
uses: peter-evans/create-pull-request@284f54f989303d2699d373481a0cfa13ad5a6666 # v5.0.1
with:
token: ${{ secrets.NEO4J_TEAM_GRAPHQL_PERSONAL_ACCESS_TOKEN }}
commit-message: ${{ steps.vars.outputs.title }}
Expand Down
532 changes: 266 additions & 266 deletions .yarn/releases/yarn-3.5.0.cjs → .yarn/releases/yarn-3.5.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: "@yarnpkg/plugin-typescript"

yarnPath: .yarn/releases/yarn-3.5.0.cjs
yarnPath: .yarn/releases/yarn-3.5.1.cjs
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ COPY package.json .
COPY yarn.lock .
COPY .yarnrc.yml .
COPY ./.yarn/ /app/.yarn/
COPY examples/neo-push/server/package.json /app/examples/neo-push/server/
COPY examples/neo-push/client/package.json /app/examples/neo-push/client/
COPY packages/graphql/package.json /app/packages/graphql/
COPY packages/ogm/package.json /app/packages/ogm/
COPY packages/package-tests/package.json /app/packages/package-tests/
Expand All @@ -16,4 +14,4 @@ RUN yarn

COPY . ./

CMD ["yarn", "test"]
CMD ["yarn", "test"]
24 changes: 13 additions & 11 deletions docs/modules/ROOT/pages/auth/setup.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,12 @@ Then, using Apollo Server as an example, you must include the request in the Gra

[source, javascript, indent=0]
----
neoSchema.getSchema().then((schema) => {
const server = new ApolloServer({
schema,
context: ({ req }) => ({ req }),
});
const server = new ApolloServer({
schema: await neoSchema.getSchema(),
});
await startStandaloneServer(server, {
context: async ({ req }) => ({ req }),
});
----

Expand Down Expand Up @@ -223,11 +224,12 @@ For example, you might have a function `decodeJWT` which returns a decoded JWT:
----
const decodedJWT = decodeJWT(encodedJWT)
neoSchema.getSchema().then((schema) => {
const server = new ApolloServer({
schema,
context: { jwt: decodedJWT.payload },
});
const server = new ApolloServer({
schema: await neoSchema.getSchema(),
});
await startStandaloneServer(server, {
context: async ({ req }) => ({ req, jwt: decodedJWT.payload }),
});
----

Expand All @@ -237,7 +239,7 @@ You can't use the `@auth` directive on custom resolvers, however, an auth parame

[source, javascript, indent=0]
----
const typeDefs = `
const typeDefs = `#graphql
type Query {
myId: ID!
}
Expand Down
Loading

0 comments on commit cbf1786

Please sign in to comment.