@effect-app/infra 0.36.1 → 0.36.2
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/CHANGELOG.md +6 -0
- package/_cjs/services/Emailer/Sendgrid.cjs +3 -1
- package/_cjs/services/Emailer/Sendgrid.cjs.map +1 -1
- package/_src/services/Emailer/Sendgrid.ts +6 -2
- package/_src/services/Emailer/service.ts +1 -0
- package/dist/services/Emailer/Sendgrid.d.ts +0 -12
- package/dist/services/Emailer/Sendgrid.d.ts.map +1 -1
- package/dist/services/Emailer/Sendgrid.js +7 -3
- package/dist/services/Emailer/service.d.ts +4 -0
- package/dist/services/Emailer/service.d.ts.map +1 -1
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -20,6 +20,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
|
20
20
|
const makeLiveSendgrid = ({
|
|
21
21
|
apiKey,
|
|
22
22
|
defaultFrom,
|
|
23
|
+
defaultReplyTo,
|
|
23
24
|
realMail,
|
|
24
25
|
subjectPrefix
|
|
25
26
|
}) => tsplus_module_2.sync(() => {
|
|
@@ -29,7 +30,8 @@ const makeLiveSendgrid = ({
|
|
|
29
30
|
return tsplus_module_2.gen(function* ($) {
|
|
30
31
|
const msg = {
|
|
31
32
|
...msg_,
|
|
32
|
-
from: msg_.from ?? defaultFrom
|
|
33
|
+
from: msg_.from ?? defaultFrom,
|
|
34
|
+
replyTo: msg_.replyTo ?? (msg_.from ? undefined : defaultReplyTo)
|
|
33
35
|
};
|
|
34
36
|
const render = renderMessage(!realMail);
|
|
35
37
|
const renderedMsg_ = render(msg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Sendgrid.cjs","names":["_mail","_interopRequireDefault","require","_util","_service","obj","__esModule","default","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","makeLiveSendgrid","apiKey","defaultFrom","realMail","subjectPrefix","tsplus_module_2","sync","sgMail","setApiKey","tsplus_module_1","value","sendMail","msg_","gen","$","msg","from","render","renderMessage","renderedMsg_","renderedMsg","subject","logAnnotate","logDebug","inspect","ret","async","cb","send","err","result","fail","LiveSendgrid","config","toLayer","flatMap","Emailer","forceFake","i","makeId","to","renderFake","cc","bcc","renderFakeIfTest","isTestAddress","toLowerCase","endsWith","email","addr","name","renderMailData","eq","tsplus_module_3","contramap","string","Array","isArray","tsplus_module_5","iterableToArray","tsplus_module_4","uniqArray","map","x","md","join"],"sources":["../../../_src/services/Emailer/Sendgrid.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;AACA,IAAAA,KAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,QAAA,GAAAF,OAAA;AAAsC,SAAAD,uBAAAI,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAI,wBAAAR,GAAA,EAAAI,WAAA,SAAAA,WAAA,IAAAJ,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAS,KAAA,GAAAN,wBAAA,CAAAC,WAAA,OAAAK,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAV,GAAA,YAAAS,KAAA,CAAAE,GAAA,CAAAX,GAAA,SAAAY,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAjB,GAAA,QAAAiB,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAApB,GAAA,EAAAiB,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAhB,GAAA,EAAAiB,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAjB,GAAA,CAAAiB,GAAA,SAAAL,MAAA,CAAAV,OAAA,GAAAF,GAAA,MAAAS,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAtB,GAAA,EAAAY,MAAA,YAAAA,MAAA;AAGtC,MAAMW,gBAAgB,GAAGA,CAAC;EAAEC,MAAM;EAAEC,WAAW;EAAEC,QAAQ;EAAEC;AAAa,CAAkB,
|
|
1
|
+
{"version":3,"file":"Sendgrid.cjs","names":["_mail","_interopRequireDefault","require","_util","_service","obj","__esModule","default","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","makeLiveSendgrid","apiKey","defaultFrom","defaultReplyTo","realMail","subjectPrefix","tsplus_module_2","sync","sgMail","setApiKey","tsplus_module_1","value","sendMail","msg_","gen","$","msg","from","replyTo","undefined","render","renderMessage","renderedMsg_","renderedMsg","subject","logAnnotate","logDebug","inspect","ret","async","cb","send","err","result","fail","LiveSendgrid","config","toLayer","flatMap","Emailer","forceFake","i","makeId","to","renderFake","cc","bcc","renderFakeIfTest","isTestAddress","toLowerCase","endsWith","email","addr","name","renderMailData","eq","tsplus_module_3","contramap","string","Array","isArray","tsplus_module_5","iterableToArray","tsplus_module_4","uniqArray","map","x","md","join"],"sources":["../../../_src/services/Emailer/Sendgrid.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -4,14 +4,18 @@ import { inspect } from "util"
|
|
|
4
4
|
import { Emailer } from "./service.js"
|
|
5
5
|
import type { EmailMsg, EmailMsgOptionalFrom, SendgridConfig } from "./service.js"
|
|
6
6
|
|
|
7
|
-
const makeLiveSendgrid = ({ apiKey, defaultFrom, realMail, subjectPrefix }: SendgridConfig) =>
|
|
7
|
+
const makeLiveSendgrid = ({ apiKey, defaultFrom, defaultReplyTo, realMail, subjectPrefix }: SendgridConfig) =>
|
|
8
8
|
Effect.sync(() => {
|
|
9
9
|
sgMail.setApiKey(apiKey.value)
|
|
10
10
|
|
|
11
11
|
return {
|
|
12
12
|
sendMail(msg_: EmailMsgOptionalFrom) {
|
|
13
13
|
return Effect.gen(function*($) {
|
|
14
|
-
const msg = {
|
|
14
|
+
const msg: EmailMsg = {
|
|
15
|
+
...msg_,
|
|
16
|
+
from: msg_.from ?? defaultFrom,
|
|
17
|
+
replyTo: msg_.replyTo ?? (msg_.from ? undefined : defaultReplyTo)
|
|
18
|
+
}
|
|
15
19
|
const render = renderMessage(!realMail)
|
|
16
20
|
|
|
17
21
|
const renderedMsg_ = render(msg)
|
|
@@ -13,6 +13,7 @@ export abstract class Emailer extends TagClass<Emailer>() {
|
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
export interface SendgridConfig {
|
|
16
|
+
defaultReplyTo?: Email | { name?: ReasonableString; email: Email }
|
|
16
17
|
subjectPrefix: string
|
|
17
18
|
realMail: boolean
|
|
18
19
|
defaultFrom: Email | { name?: ReasonableString; email: Email }
|
|
@@ -14,9 +14,6 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
|
|
|
14
14
|
to: EmailData | EmailData[] | undefined;
|
|
15
15
|
cc: EmailData | EmailData[] | undefined;
|
|
16
16
|
bcc: EmailData | EmailData[] | undefined;
|
|
17
|
-
/**
|
|
18
|
-
* @hidden
|
|
19
|
-
*/
|
|
20
17
|
from: EmailData;
|
|
21
18
|
replyTo?: EmailData | undefined;
|
|
22
19
|
sendAt?: number | undefined;
|
|
@@ -57,9 +54,6 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
|
|
|
57
54
|
to: EmailData | EmailData[] | undefined;
|
|
58
55
|
cc: EmailData | EmailData[] | undefined;
|
|
59
56
|
bcc: EmailData | EmailData[] | undefined;
|
|
60
|
-
/**
|
|
61
|
-
* @hidden
|
|
62
|
-
*/
|
|
63
57
|
from: EmailData;
|
|
64
58
|
replyTo?: EmailData | undefined;
|
|
65
59
|
sendAt?: number | undefined;
|
|
@@ -100,9 +94,6 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
|
|
|
100
94
|
to: EmailData | EmailData[] | undefined;
|
|
101
95
|
cc: EmailData | EmailData[] | undefined;
|
|
102
96
|
bcc: EmailData | EmailData[] | undefined;
|
|
103
|
-
/**
|
|
104
|
-
* @hidden
|
|
105
|
-
*/
|
|
106
97
|
from: EmailData;
|
|
107
98
|
replyTo?: EmailData | undefined;
|
|
108
99
|
sendAt?: number | undefined;
|
|
@@ -143,9 +134,6 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
|
|
|
143
134
|
to: EmailData | EmailData[] | undefined;
|
|
144
135
|
cc: EmailData | EmailData[] | undefined;
|
|
145
136
|
bcc: EmailData | EmailData[] | undefined;
|
|
146
|
-
/**
|
|
147
|
-
* @hidden
|
|
148
|
-
*/
|
|
149
137
|
from: EmailData;
|
|
150
138
|
replyTo?: EmailData | undefined;
|
|
151
139
|
sendAt?: number | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Sendgrid.d.ts","sourceRoot":"","sources":["../../../_src/services/Emailer/Sendgrid.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAA;AAG3E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,KAAK,EAAE,QAAQ,EAAwB,cAAc,EAAE,MAAM,cAAc,CAAA;;;;;
|
|
1
|
+
{"version":3,"file":"Sendgrid.d.ts","sourceRoot":"","sources":["../../../_src/services/Emailer/Sendgrid.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAA;AAG3E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,KAAK,EAAE,QAAQ,EAAwB,cAAc,EAAE,MAAM,cAAc,CAAA;;;;;AAoDlF,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,mGAI1D;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,OAAO,SAUpC,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMnB;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,EAAE,EAAE,SAAS,WAO1C"}
|
|
@@ -6,12 +6,16 @@ import * as tsplus_module_5 from "@effect-app/core/Array";
|
|
|
6
6
|
import sgMail from "@sendgrid/mail";
|
|
7
7
|
import { inspect } from "util";
|
|
8
8
|
import { Emailer } from "./service.js";
|
|
9
|
-
const makeLiveSendgrid = ({ apiKey, defaultFrom, realMail, subjectPrefix }) => tsplus_module_2.sync(() => {
|
|
9
|
+
const makeLiveSendgrid = ({ apiKey, defaultFrom, defaultReplyTo, realMail, subjectPrefix }) => tsplus_module_2.sync(() => {
|
|
10
10
|
sgMail.setApiKey(tsplus_module_1.value(apiKey));
|
|
11
11
|
return {
|
|
12
12
|
sendMail(msg_) {
|
|
13
13
|
return tsplus_module_2.gen(function* ($) {
|
|
14
|
-
const msg = {
|
|
14
|
+
const msg = {
|
|
15
|
+
...msg_,
|
|
16
|
+
from: msg_.from ?? defaultFrom,
|
|
17
|
+
replyTo: msg_.replyTo ?? (msg_.from ? undefined : defaultReplyTo)
|
|
18
|
+
};
|
|
15
19
|
const render = renderMessage(!realMail);
|
|
16
20
|
const renderedMsg_ = render(msg);
|
|
17
21
|
const renderedMsg = { ...renderedMsg_, subject: `${subjectPrefix}${renderedMsg_.subject}` };
|
|
@@ -93,4 +97,4 @@ function renderMailData(md) {
|
|
|
93
97
|
}
|
|
94
98
|
return md.email;
|
|
95
99
|
}
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
100
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VuZGdyaWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL3NlcnZpY2VzL0VtYWlsZXIvU2VuZGdyaWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFDQSxPQUFPLE1BQU0sTUFBTSxnQkFBZ0IsQ0FBQTtBQUNuQyxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFBO0FBQzlCLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFHdEMsTUFBTSxnQkFBZ0IsR0FBRyxDQUFDLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxjQUFjLEVBQUUsUUFBUSxFQUFFLGFBQWEsRUFBa0IsRUFBRSxFQUFFLENBQzVHLHFCQUFZLEdBQUcsRUFBRTtJQUNmLE1BQU0sQ0FBQyxTQUFTLHVCQUFDLE1BQU0sRUFBTyxDQUFBO0lBRTlCLE9BQU87UUFDTCxRQUFRLENBQUMsSUFBMEI7WUFDakMsT0FBTyxvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO2dCQUMzQixNQUFNLEdBQUcsR0FBYTtvQkFDcEIsR0FBRyxJQUFJO29CQUNQLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSSxJQUFJLFdBQVc7b0JBQzlCLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxjQUFjLENBQUM7aUJBQ2xFLENBQUE7Z0JBQ0QsTUFBTSxNQUFNLEdBQUcsYUFBYSxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUE7Z0JBRXZDLE1BQU0sWUFBWSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTtnQkFDaEMsTUFBTSxXQUFXLEdBQUcsRUFBRSxHQUFHLFlBQVksRUFBRSxPQUFPLEVBQUUsR0FBRyxhQUFhLEdBQUcsWUFBWSxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUE7Z0JBQzNGLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyw0QkFB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
|
|
@@ -16,6 +16,10 @@ export declare abstract class Emailer extends Emailer_base {
|
|
|
16
16
|
abstract sendMail: (msg: EmailMsgOptionalFrom) => Effect<RequestContext, Error | ResponseError, void>;
|
|
17
17
|
}
|
|
18
18
|
export interface SendgridConfig {
|
|
19
|
+
defaultReplyTo?: Email | {
|
|
20
|
+
name?: ReasonableString;
|
|
21
|
+
email: Email;
|
|
22
|
+
};
|
|
19
23
|
subjectPrefix: string;
|
|
20
24
|
realMail: boolean;
|
|
21
25
|
defaultFrom: Email | {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../_src/services/Emailer/service.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAA;AAC9E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAA;AAExC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;;AAE7D;;;GAGG;AACH,8BAAsB,OAAQ,SAAQ,YAAmB;IACvD,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,oBAAoB,KAAK,MAAM,CAAC,cAAc,EAAE,KAAK,GAAG,aAAa,EAAE,IAAI,CAAC,CAAA;CACtG;AAED,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,KAAK,GAAG;QAAE,IAAI,CAAC,EAAE,gBAAgB,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAA;IAC9D,MAAM,EAAE,YAAY,CAAA;CACrB;AACD,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAA;AAC9C,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CAAA;AAEhE,MAAM,MAAM,oBAAoB,GAC5B,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,GACtB,CACA;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,qBAAqB,CAAC,WAAW,CAAC,CAAA;CAAE,CAC/G,GACC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../_src/services/Emailer/service.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAA;AAC9E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAA;AAExC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;;AAE7D;;;GAGG;AACH,8BAAsB,OAAQ,SAAQ,YAAmB;IACvD,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,oBAAoB,KAAK,MAAM,CAAC,cAAc,EAAE,KAAK,GAAG,aAAa,EAAE,IAAI,CAAC,CAAA;CACtG;AAED,MAAM,WAAW,cAAc;IAC7B,cAAc,CAAC,EAAE,KAAK,GAAG;QAAE,IAAI,CAAC,EAAE,gBAAgB,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAA;IAClE,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,KAAK,GAAG;QAAE,IAAI,CAAC,EAAE,gBAAgB,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAA;IAC9D,MAAM,EAAE,YAAY,CAAA;CACrB;AACD,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAA;AAC9C,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CAAA;AAEhE,MAAM,MAAM,oBAAoB,GAC5B,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,GACtB,CACA;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,qBAAqB,CAAC,WAAW,CAAC,CAAA;CAAE,CAC/G,GACC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "0.36.
|
|
3
|
+
"version": "0.36.2",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
"redlock": "^4.2.0",
|
|
22
22
|
"@effect-app/prelude": "0.26.1",
|
|
23
23
|
"@effect-app/core": "0.33.0",
|
|
24
|
-
"@effect-app/
|
|
25
|
-
"@effect-app/
|
|
24
|
+
"@effect-app/schema": "0.24.0",
|
|
25
|
+
"@effect-app/infra-adapters": "0.26.1"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
28
|
"@babel/cli": "^7.21.0",
|