@cedarjs/graphql-server 4.0.0-canary.13817 → 4.0.0-canary.13821
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/functions/graphql.d.ts.map +1 -1
- package/dist/cjs/functions/graphql.js +51 -1
- package/dist/cjs/plugins/useRedwoodAuthContext.d.ts.map +1 -1
- package/dist/cjs/plugins/useRedwoodAuthContext.js +20 -6
- package/dist/cjs/types.d.ts +8 -4
- package/dist/cjs/types.d.ts.map +1 -1
- package/dist/functions/graphql.d.ts.map +1 -1
- package/dist/functions/graphql.js +41 -1
- package/dist/plugins/useRedwoodAuthContext.d.ts.map +1 -1
- package/dist/plugins/useRedwoodAuthContext.js +20 -6
- package/dist/types.d.ts +8 -4
- package/dist/types.d.ts.map +1 -1
- package/package.json +8 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../../src/functions/graphql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EAEpB,OAAO,IAAI,aAAa,EACzB,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../../src/functions/graphql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EAEpB,OAAO,IAAI,aAAa,EACzB,MAAM,YAAY,CAAA;AAQnB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AA4CxD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,oBAAoB,GAAI,uTAsBlC,qBAAqB,MAyHpB,OAAO,oBAAoB,EAC3B,SAAS,aAAa,KACrB,OAAO,CAAC,GAAG,CAcf,CAAA"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __create = Object.create;
|
|
2
3
|
var __defProp = Object.defineProperty;
|
|
3
4
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
5
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
5
7
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
8
|
var __export = (target, all) => {
|
|
7
9
|
for (var name in all)
|
|
@@ -15,14 +17,52 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
15
17
|
}
|
|
16
18
|
return to;
|
|
17
19
|
};
|
|
20
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
22
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
23
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
24
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
25
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
26
|
+
mod
|
|
27
|
+
));
|
|
18
28
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
29
|
var graphql_exports = {};
|
|
20
30
|
__export(graphql_exports, {
|
|
21
31
|
createGraphQLHandler: () => createGraphQLHandler
|
|
22
32
|
});
|
|
23
33
|
module.exports = __toCommonJS(graphql_exports);
|
|
34
|
+
var cookie = __toESM(require("cookie"), 1);
|
|
35
|
+
var import_api = require("@cedarjs/api");
|
|
24
36
|
var import_store = require("@cedarjs/context/dist/store");
|
|
25
37
|
var import_createGraphQLYoga = require("../createGraphQLYoga.js");
|
|
38
|
+
function lambdaQueryToSearchParams(event) {
|
|
39
|
+
const query = new URLSearchParams();
|
|
40
|
+
if (event.multiValueQueryStringParameters) {
|
|
41
|
+
for (const [key, values] of Object.entries(
|
|
42
|
+
event.multiValueQueryStringParameters
|
|
43
|
+
)) {
|
|
44
|
+
if (values) {
|
|
45
|
+
for (const value of values) {
|
|
46
|
+
query.append(key, value);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
} else if (event.queryStringParameters) {
|
|
51
|
+
for (const [key, value] of Object.entries(event.queryStringParameters)) {
|
|
52
|
+
if (value != null) {
|
|
53
|
+
query.set(key, value);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
return query;
|
|
58
|
+
}
|
|
59
|
+
function parseLambdaCookies(event) {
|
|
60
|
+
return new Map(
|
|
61
|
+
Object.entries(cookie.parse(event.headers?.cookie ?? "")).filter(
|
|
62
|
+
(entry) => entry[1] !== void 0
|
|
63
|
+
)
|
|
64
|
+
);
|
|
65
|
+
}
|
|
26
66
|
const createGraphQLHandler = ({
|
|
27
67
|
healthCheckId,
|
|
28
68
|
loggerConfig,
|
|
@@ -92,7 +132,17 @@ const createGraphQLHandler = ({
|
|
|
92
132
|
},
|
|
93
133
|
{
|
|
94
134
|
event,
|
|
95
|
-
requestContext
|
|
135
|
+
requestContext,
|
|
136
|
+
cedarContext: {
|
|
137
|
+
params: event.pathParameters ?? {},
|
|
138
|
+
query: lambdaQueryToSearchParams(event),
|
|
139
|
+
cookies: parseLambdaCookies(event),
|
|
140
|
+
serverAuthState: await (0, import_api.getAuthenticationContext)({
|
|
141
|
+
authDecoder,
|
|
142
|
+
event,
|
|
143
|
+
context: requestContext
|
|
144
|
+
})
|
|
145
|
+
}
|
|
96
146
|
}
|
|
97
147
|
);
|
|
98
148
|
const responseHeaders = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRedwoodAuthContext.d.ts","sourceRoot":"","sources":["../../../src/plugins/useRedwoodAuthContext.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useRedwoodAuthContext.d.ts","sourceRoot":"","sources":["../../../src/plugins/useRedwoodAuthContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAE1C,OAAO,KAAK,EAAsB,OAAO,EAAE,MAAM,cAAc,CAAA;AAG/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAE7E;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,gBAAgB,qBAAqB,CAAC,gBAAgB,CAAC,EACvD,cAAc,OAAO,GAAG,OAAO,EAAE,KAChC,MAAM,CAAC,mBAAmB,CAyC5B,CAAA"}
|
|
@@ -25,13 +25,16 @@ var import_api = require("@cedarjs/api");
|
|
|
25
25
|
const useRedwoodAuthContext = (getCurrentUser, authDecoder) => {
|
|
26
26
|
return {
|
|
27
27
|
async onContextBuilding({ context, extendContext }) {
|
|
28
|
-
let authContext =
|
|
28
|
+
let authContext = context.cedarContext?.serverAuthState;
|
|
29
29
|
try {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
30
|
+
if (!authContext) {
|
|
31
|
+
const authEvent = getAuthEvent(context);
|
|
32
|
+
authContext = await (0, import_api.getAuthenticationContext)({
|
|
33
|
+
authDecoder,
|
|
34
|
+
event: authEvent,
|
|
35
|
+
context: context.requestContext
|
|
36
|
+
});
|
|
37
|
+
}
|
|
35
38
|
} catch (error) {
|
|
36
39
|
throw new Error(
|
|
37
40
|
`Exception in getAuthenticationContext: ${error.message}`
|
|
@@ -54,6 +57,17 @@ const useRedwoodAuthContext = (getCurrentUser, authDecoder) => {
|
|
|
54
57
|
}
|
|
55
58
|
};
|
|
56
59
|
};
|
|
60
|
+
function getAuthEvent(context) {
|
|
61
|
+
if (context.request) {
|
|
62
|
+
return context.request;
|
|
63
|
+
}
|
|
64
|
+
if (context.event) {
|
|
65
|
+
return context.event;
|
|
66
|
+
}
|
|
67
|
+
throw new Error(
|
|
68
|
+
"GraphQL context contains neither a fetch-native Request nor a Lambda event. Please report this as a Cedar bug."
|
|
69
|
+
);
|
|
70
|
+
}
|
|
57
71
|
// Annotate the CommonJS export names for ESM import in node:
|
|
58
72
|
0 && (module.exports = {
|
|
59
73
|
useRedwoodAuthContext
|
package/dist/cjs/types.d.ts
CHANGED
|
@@ -4,8 +4,8 @@ import type { IExecutableSchemaDefinition } from '@graphql-tools/schema';
|
|
|
4
4
|
import type { APIGatewayProxyEvent, Context as LambdaContext } from 'aws-lambda';
|
|
5
5
|
import type { GraphQLObjectType, GraphQLInterfaceType, DocumentNode } from 'graphql';
|
|
6
6
|
import type { Plugin } from 'graphql-yoga';
|
|
7
|
-
import type { AuthContextPayload, Decoder } from '@cedarjs/api';
|
|
8
|
-
import type {
|
|
7
|
+
import type { AuthContextPayload, CorsConfig, Decoder } from '@cedarjs/api';
|
|
8
|
+
import type { CedarRequestContext } from '@cedarjs/api/runtime';
|
|
9
9
|
import type { CedarRealtimeOptions } from '@cedarjs/realtime';
|
|
10
10
|
import type { DirectiveGlobImports } from './directives/makeDirectives.js';
|
|
11
11
|
import type { useRedwoodDirectiveReturn, DirectivePluginOptions } from './plugins/useRedwoodDirective.js';
|
|
@@ -46,7 +46,9 @@ export type ArmorConfig = {
|
|
|
46
46
|
* This is an interface so you can extend it inside your application when needed
|
|
47
47
|
*/
|
|
48
48
|
export interface CedarGraphQLContext {
|
|
49
|
-
|
|
49
|
+
request?: Request;
|
|
50
|
+
cedarContext?: CedarRequestContext;
|
|
51
|
+
event?: APIGatewayProxyEvent;
|
|
50
52
|
requestContext?: LambdaContext | undefined;
|
|
51
53
|
currentUser?: ThenArg<ReturnType<GetCurrentUser>> | AuthContextPayload | null;
|
|
52
54
|
[index: string]: unknown;
|
|
@@ -56,7 +58,9 @@ export interface CedarGraphQLContext {
|
|
|
56
58
|
* @deprecated Please use CedarGraphQLContext
|
|
57
59
|
*/
|
|
58
60
|
export interface RedwoodGraphQLContext {
|
|
59
|
-
|
|
61
|
+
request?: Request;
|
|
62
|
+
cedarContext?: CedarRequestContext;
|
|
63
|
+
event?: APIGatewayProxyEvent;
|
|
60
64
|
requestContext: LambdaContext | undefined;
|
|
61
65
|
currentUser?: ThenArg<ReturnType<GetCurrentUser>> | AuthContextPayload | null;
|
|
62
66
|
[index: string]: unknown;
|
package/dist/cjs/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AACvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAC1E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAA;AACxE,OAAO,KAAK,EAAE,oBAAoB,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,YAAY,CAAA;AAChF,OAAO,KAAK,EACV,iBAAiB,EACjB,oBAAoB,EACpB,YAAY,EACb,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAE1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/functions/graphql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EAEpB,OAAO,IAAI,aAAa,EACzB,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/functions/graphql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EAEpB,OAAO,IAAI,aAAa,EACzB,MAAM,YAAY,CAAA;AAQnB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AA4CxD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,oBAAoB,GAAI,uTAsBlC,qBAAqB,MAyHpB,OAAO,oBAAoB,EAC3B,SAAS,aAAa,KACrB,OAAO,CAAC,GAAG,CAcf,CAAA"}
|
|
@@ -1,5 +1,35 @@
|
|
|
1
|
+
import * as cookie from "cookie";
|
|
2
|
+
import { getAuthenticationContext } from "@cedarjs/api";
|
|
1
3
|
import { getAsyncStoreInstance } from "@cedarjs/context/dist/store";
|
|
2
4
|
import { createGraphQLYoga } from "../createGraphQLYoga.js";
|
|
5
|
+
function lambdaQueryToSearchParams(event) {
|
|
6
|
+
const query = new URLSearchParams();
|
|
7
|
+
if (event.multiValueQueryStringParameters) {
|
|
8
|
+
for (const [key, values] of Object.entries(
|
|
9
|
+
event.multiValueQueryStringParameters
|
|
10
|
+
)) {
|
|
11
|
+
if (values) {
|
|
12
|
+
for (const value of values) {
|
|
13
|
+
query.append(key, value);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
} else if (event.queryStringParameters) {
|
|
18
|
+
for (const [key, value] of Object.entries(event.queryStringParameters)) {
|
|
19
|
+
if (value != null) {
|
|
20
|
+
query.set(key, value);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
return query;
|
|
25
|
+
}
|
|
26
|
+
function parseLambdaCookies(event) {
|
|
27
|
+
return new Map(
|
|
28
|
+
Object.entries(cookie.parse(event.headers?.cookie ?? "")).filter(
|
|
29
|
+
(entry) => entry[1] !== void 0
|
|
30
|
+
)
|
|
31
|
+
);
|
|
32
|
+
}
|
|
3
33
|
const createGraphQLHandler = ({
|
|
4
34
|
healthCheckId,
|
|
5
35
|
loggerConfig,
|
|
@@ -69,7 +99,17 @@ const createGraphQLHandler = ({
|
|
|
69
99
|
},
|
|
70
100
|
{
|
|
71
101
|
event,
|
|
72
|
-
requestContext
|
|
102
|
+
requestContext,
|
|
103
|
+
cedarContext: {
|
|
104
|
+
params: event.pathParameters ?? {},
|
|
105
|
+
query: lambdaQueryToSearchParams(event),
|
|
106
|
+
cookies: parseLambdaCookies(event),
|
|
107
|
+
serverAuthState: await getAuthenticationContext({
|
|
108
|
+
authDecoder,
|
|
109
|
+
event,
|
|
110
|
+
context: requestContext
|
|
111
|
+
})
|
|
112
|
+
}
|
|
73
113
|
}
|
|
74
114
|
);
|
|
75
115
|
const responseHeaders = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRedwoodAuthContext.d.ts","sourceRoot":"","sources":["../../src/plugins/useRedwoodAuthContext.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useRedwoodAuthContext.d.ts","sourceRoot":"","sources":["../../src/plugins/useRedwoodAuthContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAE1C,OAAO,KAAK,EAAsB,OAAO,EAAE,MAAM,cAAc,CAAA;AAG/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAE7E;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,gBAAgB,qBAAqB,CAAC,gBAAgB,CAAC,EACvD,cAAc,OAAO,GAAG,OAAO,EAAE,KAChC,MAAM,CAAC,mBAAmB,CAyC5B,CAAA"}
|
|
@@ -2,13 +2,16 @@ import { getAuthenticationContext } from "@cedarjs/api";
|
|
|
2
2
|
const useRedwoodAuthContext = (getCurrentUser, authDecoder) => {
|
|
3
3
|
return {
|
|
4
4
|
async onContextBuilding({ context, extendContext }) {
|
|
5
|
-
let authContext =
|
|
5
|
+
let authContext = context.cedarContext?.serverAuthState;
|
|
6
6
|
try {
|
|
7
|
-
authContext
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
7
|
+
if (!authContext) {
|
|
8
|
+
const authEvent = getAuthEvent(context);
|
|
9
|
+
authContext = await getAuthenticationContext({
|
|
10
|
+
authDecoder,
|
|
11
|
+
event: authEvent,
|
|
12
|
+
context: context.requestContext
|
|
13
|
+
});
|
|
14
|
+
}
|
|
12
15
|
} catch (error) {
|
|
13
16
|
throw new Error(
|
|
14
17
|
`Exception in getAuthenticationContext: ${error.message}`
|
|
@@ -31,6 +34,17 @@ const useRedwoodAuthContext = (getCurrentUser, authDecoder) => {
|
|
|
31
34
|
}
|
|
32
35
|
};
|
|
33
36
|
};
|
|
37
|
+
function getAuthEvent(context) {
|
|
38
|
+
if (context.request) {
|
|
39
|
+
return context.request;
|
|
40
|
+
}
|
|
41
|
+
if (context.event) {
|
|
42
|
+
return context.event;
|
|
43
|
+
}
|
|
44
|
+
throw new Error(
|
|
45
|
+
"GraphQL context contains neither a fetch-native Request nor a Lambda event. Please report this as a Cedar bug."
|
|
46
|
+
);
|
|
47
|
+
}
|
|
34
48
|
export {
|
|
35
49
|
useRedwoodAuthContext
|
|
36
50
|
};
|
package/dist/types.d.ts
CHANGED
|
@@ -4,8 +4,8 @@ import type { IExecutableSchemaDefinition } from '@graphql-tools/schema';
|
|
|
4
4
|
import type { APIGatewayProxyEvent, Context as LambdaContext } from 'aws-lambda';
|
|
5
5
|
import type { GraphQLObjectType, GraphQLInterfaceType, DocumentNode } from 'graphql';
|
|
6
6
|
import type { Plugin } from 'graphql-yoga';
|
|
7
|
-
import type { AuthContextPayload, Decoder } from '@cedarjs/api';
|
|
8
|
-
import type {
|
|
7
|
+
import type { AuthContextPayload, CorsConfig, Decoder } from '@cedarjs/api';
|
|
8
|
+
import type { CedarRequestContext } from '@cedarjs/api/runtime';
|
|
9
9
|
import type { CedarRealtimeOptions } from '@cedarjs/realtime';
|
|
10
10
|
import type { DirectiveGlobImports } from './directives/makeDirectives.js';
|
|
11
11
|
import type { useRedwoodDirectiveReturn, DirectivePluginOptions } from './plugins/useRedwoodDirective.js';
|
|
@@ -46,7 +46,9 @@ export type ArmorConfig = {
|
|
|
46
46
|
* This is an interface so you can extend it inside your application when needed
|
|
47
47
|
*/
|
|
48
48
|
export interface CedarGraphQLContext {
|
|
49
|
-
|
|
49
|
+
request?: Request;
|
|
50
|
+
cedarContext?: CedarRequestContext;
|
|
51
|
+
event?: APIGatewayProxyEvent;
|
|
50
52
|
requestContext?: LambdaContext | undefined;
|
|
51
53
|
currentUser?: ThenArg<ReturnType<GetCurrentUser>> | AuthContextPayload | null;
|
|
52
54
|
[index: string]: unknown;
|
|
@@ -56,7 +58,9 @@ export interface CedarGraphQLContext {
|
|
|
56
58
|
* @deprecated Please use CedarGraphQLContext
|
|
57
59
|
*/
|
|
58
60
|
export interface RedwoodGraphQLContext {
|
|
59
|
-
|
|
61
|
+
request?: Request;
|
|
62
|
+
cedarContext?: CedarRequestContext;
|
|
63
|
+
event?: APIGatewayProxyEvent;
|
|
60
64
|
requestContext: LambdaContext | undefined;
|
|
61
65
|
currentUser?: ThenArg<ReturnType<GetCurrentUser>> | AuthContextPayload | null;
|
|
62
66
|
[index: string]: unknown;
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AACvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAC1E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAA;AACxE,OAAO,KAAK,EAAE,oBAAoB,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,YAAY,CAAA;AAChF,OAAO,KAAK,EACV,iBAAiB,EACjB,oBAAoB,EACpB,YAAY,EACb,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAE1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cedarjs/graphql-server",
|
|
3
|
-
"version": "4.0.0-canary.
|
|
3
|
+
"version": "4.0.0-canary.13821+c50dad5fb2",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+https://github.com/cedarjs/cedar.git",
|
|
@@ -37,8 +37,8 @@
|
|
|
37
37
|
"test:watch": "yarn test --watch"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@cedarjs/api": "4.0.0-canary.
|
|
41
|
-
"@cedarjs/context": "4.0.0-canary.
|
|
40
|
+
"@cedarjs/api": "4.0.0-canary.13821",
|
|
41
|
+
"@cedarjs/context": "4.0.0-canary.13821",
|
|
42
42
|
"@envelop/core": "5.5.1",
|
|
43
43
|
"@envelop/depth-limit": "4.0.0",
|
|
44
44
|
"@envelop/disable-introspection": "6.0.0",
|
|
@@ -50,6 +50,7 @@
|
|
|
50
50
|
"@graphql-tools/utils": "10.11.0",
|
|
51
51
|
"@graphql-yoga/plugin-persisted-operations": "3.21.0",
|
|
52
52
|
"@opentelemetry/api": "1.9.0",
|
|
53
|
+
"cookie": "1.1.1",
|
|
53
54
|
"graphql": "16.13.2",
|
|
54
55
|
"graphql-scalars": "1.25.0",
|
|
55
56
|
"graphql-tag": "2.12.6",
|
|
@@ -60,9 +61,9 @@
|
|
|
60
61
|
"devDependencies": {
|
|
61
62
|
"@babel/cli": "7.28.6",
|
|
62
63
|
"@babel/core": "^7.26.10",
|
|
63
|
-
"@cedarjs/framework-tools": "4.0.0-canary.
|
|
64
|
-
"@cedarjs/project-config": "4.0.0-canary.
|
|
65
|
-
"@cedarjs/realtime": "4.0.0-canary.
|
|
64
|
+
"@cedarjs/framework-tools": "4.0.0-canary.13821",
|
|
65
|
+
"@cedarjs/project-config": "4.0.0-canary.13821",
|
|
66
|
+
"@cedarjs/realtime": "4.0.0-canary.13821",
|
|
66
67
|
"@envelop/types": "5.2.1",
|
|
67
68
|
"@types/aws-lambda": "8.10.161",
|
|
68
69
|
"@types/jsonwebtoken": "9.0.10",
|
|
@@ -82,5 +83,5 @@
|
|
|
82
83
|
"publishConfig": {
|
|
83
84
|
"access": "public"
|
|
84
85
|
},
|
|
85
|
-
"gitHead": "
|
|
86
|
+
"gitHead": "c50dad5fb2c3d3571a8151f7a5af200a5a077104"
|
|
86
87
|
}
|