Skip to content

Commit d6acab2

Browse files
authored
Merge branch '4.0.0' into make-relationship-properties-directive-mandatory
2 parents a9ace01 + 9eb4ffc commit d6acab2

File tree

18 files changed

+111
-111
lines changed

18 files changed

+111
-111
lines changed

packages/apollo-federation-subgraph-compatibility/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { startServer } from "./server";
2626
const {
2727
NEO4J_URI = "neo4j://localhost:7687/neo4j",
2828
NEO4J_USERNAME = "neo4j",
29-
NEO4J_PASSWORD = "password"
29+
NEO4J_PASSWORD = "password",
3030
} = process.env;
3131

3232
const driver = neo4j.driver(NEO4J_URI, neo4j.auth.basic(NEO4J_USERNAME, NEO4J_PASSWORD));

packages/apollo-federation-subgraph-compatibility/src/resolvers.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ export const resolvers = {
2424
context.resolveTree.args.representations[0].totalProductsCreated /
2525
context.resolveTree.args.representations[0].yearsOfEmployment
2626
);
27-
}
28-
}
27+
},
28+
},
2929
};

packages/apollo-federation-subgraph-compatibility/src/server.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ export async function startServer({ typeDefs, resolvers, driver }): Promise<stri
3939

4040
schema = wrapSchema({
4141
schema,
42-
transforms: [new FilterObjectFields(filter)]
42+
transforms: [new FilterObjectFields(filter)],
4343
});
4444

4545
const server = new ApolloServer({
46-
schema
46+
schema,
4747
});
4848

4949
const { url } = await startStandaloneServer(server, {
50-
listen: { port: 4001 }
50+
listen: { port: 4001 },
5151
});
5252

5353
return url;

packages/apollo-federation-subgraph-compatibility/subgraph.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module.exports = {
33
apps: [
44
{
55
name: "subgraph",
6-
script: "dist/bundle.js"
7-
}
8-
]
6+
script: "dist/bundle.js",
7+
},
8+
],
99
};

packages/apollo-federation-subgraph-compatibility/webpack.config.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@ module.exports = {
3131
test: /\.tsx?$/,
3232
loader: "ts-loader",
3333
exclude: /node_modules/,
34-
options: { projectReferences: true, transpileOnly: true }
35-
}
36-
]
34+
options: { projectReferences: true, transpileOnly: true },
35+
},
36+
],
3737
},
3838
resolve: {
3939
plugins: [new TsconfigPathsPlugin()],
40-
extensions: [".ts", ".mjs", ".js"]
40+
extensions: [".ts", ".mjs", ".js"],
4141
},
4242
plugins: [
4343
new ForkTsCheckerWebpackPlugin({
4444
typescript: {
45-
build: true
46-
}
47-
})
45+
build: true,
46+
},
47+
}),
4848
],
4949
output: {
5050
filename: "bundle.js",
51-
path: path.resolve(__dirname, "dist")
52-
}
51+
path: path.resolve(__dirname, "dist"),
52+
},
5353
};

packages/cypher-builder/src/Cypher.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export {
7575
contains,
7676
startsWith,
7777
endsWith,
78-
matches
78+
matches,
7979
} from "./expressions/operations/comparison";
8080
export { plus, minus } from "./expressions/operations/math";
8181

@@ -95,15 +95,15 @@ export {
9595
sum,
9696
randomUUID,
9797
id,
98-
elementId
98+
elementId,
9999
} from "./expressions/functions/CypherFunctions";
100100

101101
export {
102102
cypherDatetime as datetime,
103103
cypherDate as date,
104104
cypherLocalTime as localtime,
105105
cypherLocalDatetime as localdatetime,
106-
cypherTime as time
106+
cypherTime as time,
107107
} from "./expressions/functions/TemporalFunctions";
108108

109109
export * from "./expressions/functions/StringFunctions";

packages/graphql-toolbox/postcss.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ module.exports = {
22
plugins: {
33
tailwindcss: {},
44
autoprefixer: {},
5-
}
5+
},
66
}

packages/graphql-toolbox/src/modules/EditorView/docexplorer/FieldDoc.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export default function FieldDoc({ field, onClickType }: FieldDocProps) {
4848
</div>
4949
);
5050
const deprecatedArgs = field.args.filter(arg =>
51-
Boolean(arg.deprecationReason),
51+
Boolean(arg.deprecationReason)
5252
);
5353
if (deprecatedArgs.length > 0) {
5454
deprecatedArgsDef = (

packages/graphql/src/translate/batch-create/parser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ function isScalarOrEnum(fieldName: string, graphElement: GraphElement) {
113113
graphElement.temporalFields,
114114
graphElement.pointFields,
115115
graphElement.scalarFields,
116-
graphElement.enumFields
116+
graphElement.enumFields,
117117
];
118118
return scalarOrEnumFields.flat().some(scalarOrEnumPredicate);
119119
}

packages/graphql/src/translate/create-projection-and-params.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ export default function createProjectionAndParams({
252252
subqueryReturnAlias,
253253
nestedProjection: recurse.projection,
254254
nestedSubqueries: [...recurse.subqueriesBeforeSort, ...recurse.subqueries],
255-
targetNode: targetNode as Cypher.Node,
255+
targetNode: targetNode,
256256
relationField,
257257
relationshipDirection: direction,
258258
optionsInput,

0 commit comments

Comments
 (0)