@trigger.dev/build 0.0.0-re2-20250528133904 → 0.0.0-re2-20250529112227
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/commonjs/extensions/core/syncEnvVars.d.ts +1 -0
- package/dist/commonjs/extensions/core/syncEnvVars.js +30 -15
- package/dist/commonjs/extensions/core/syncEnvVars.js.map +1 -1
- package/dist/commonjs/extensions/core/vercelSyncEnvVars.js +9 -6
- package/dist/commonjs/extensions/core/vercelSyncEnvVars.js.map +1 -1
- package/dist/commonjs/version.js +1 -1
- package/dist/esm/extensions/core/syncEnvVars.d.ts +1 -0
- package/dist/esm/extensions/core/syncEnvVars.js +30 -15
- package/dist/esm/extensions/core/syncEnvVars.js.map +1 -1
- package/dist/esm/extensions/core/vercelSyncEnvVars.js +9 -6
- package/dist/esm/extensions/core/vercelSyncEnvVars.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +2 -2
|
@@ -2,6 +2,7 @@ import { BuildExtension } from "@trigger.dev/core/v3/build";
|
|
|
2
2
|
export type SyncEnvVarsBody = Record<string, string> | Array<{
|
|
3
3
|
name: string;
|
|
4
4
|
value: string;
|
|
5
|
+
isParentEnv?: boolean;
|
|
5
6
|
}>;
|
|
6
7
|
export type SyncEnvVarsResult = SyncEnvVarsBody | Promise<void | undefined | SyncEnvVarsBody> | void | undefined;
|
|
7
8
|
export type SyncEnvVarsParams = {
|
|
@@ -63,18 +63,9 @@ function syncEnvVars(fn, options) {
|
|
|
63
63
|
$spinner.stop("No env vars detected");
|
|
64
64
|
return;
|
|
65
65
|
}
|
|
66
|
-
const env =
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
}
|
|
70
|
-
// Strip out any TRIGGER_ prefix env vars
|
|
71
|
-
if (UNSYNCABLE_ENV_VARS_PREFIXES.some((prefix) => key.startsWith(prefix))) {
|
|
72
|
-
return acc;
|
|
73
|
-
}
|
|
74
|
-
acc[key] = value;
|
|
75
|
-
return acc;
|
|
76
|
-
}, {});
|
|
77
|
-
const numberOfEnvVars = Object.keys(env).length;
|
|
66
|
+
const env = stripUnsyncableEnvVars(result.env);
|
|
67
|
+
const parentEnv = result.parentEnv ? stripUnsyncableEnvVars(result.parentEnv) : undefined;
|
|
68
|
+
const numberOfEnvVars = Object.keys(env).length + (parentEnv ? Object.keys(parentEnv).length : 0);
|
|
78
69
|
if (numberOfEnvVars === 0) {
|
|
79
70
|
$spinner.stop("No env vars detected");
|
|
80
71
|
return;
|
|
@@ -89,15 +80,31 @@ function syncEnvVars(fn, options) {
|
|
|
89
80
|
id: "sync-env-vars",
|
|
90
81
|
deploy: {
|
|
91
82
|
env,
|
|
83
|
+
parentEnv,
|
|
92
84
|
override: options?.override ?? true,
|
|
93
85
|
},
|
|
94
86
|
});
|
|
95
87
|
},
|
|
96
88
|
};
|
|
97
89
|
}
|
|
90
|
+
function stripUnsyncableEnvVars(env) {
|
|
91
|
+
return Object.entries(env).reduce((acc, [key, value]) => {
|
|
92
|
+
if (UNSYNCABLE_ENV_VARS.includes(key)) {
|
|
93
|
+
return acc;
|
|
94
|
+
}
|
|
95
|
+
// Strip out any TRIGGER_ prefix env vars
|
|
96
|
+
if (UNSYNCABLE_ENV_VARS_PREFIXES.some((prefix) => key.startsWith(prefix))) {
|
|
97
|
+
return acc;
|
|
98
|
+
}
|
|
99
|
+
acc[key] = value;
|
|
100
|
+
return acc;
|
|
101
|
+
}, {});
|
|
102
|
+
}
|
|
98
103
|
async function callSyncEnvVarsFn(syncEnvVarsFn, env, environment, branch, context) {
|
|
99
104
|
if (syncEnvVarsFn && typeof syncEnvVarsFn === "function") {
|
|
100
|
-
let resolvedEnvVars = {
|
|
105
|
+
let resolvedEnvVars = {
|
|
106
|
+
env: {},
|
|
107
|
+
};
|
|
101
108
|
let result;
|
|
102
109
|
try {
|
|
103
110
|
result = await syncEnvVarsFn({
|
|
@@ -121,12 +128,20 @@ async function callSyncEnvVarsFn(syncEnvVarsFn, env, environment, branch, contex
|
|
|
121
128
|
"value" in item &&
|
|
122
129
|
typeof item.name === "string" &&
|
|
123
130
|
typeof item.value === "string") {
|
|
124
|
-
|
|
131
|
+
if (item.isParentEnv) {
|
|
132
|
+
if (!resolvedEnvVars.parentEnv) {
|
|
133
|
+
resolvedEnvVars.parentEnv = {};
|
|
134
|
+
}
|
|
135
|
+
resolvedEnvVars.parentEnv[item.name] = item.value;
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
resolvedEnvVars.env[item.name] = item.value;
|
|
139
|
+
}
|
|
125
140
|
}
|
|
126
141
|
}
|
|
127
142
|
}
|
|
128
143
|
else if (result) {
|
|
129
|
-
resolvedEnvVars = result;
|
|
144
|
+
resolvedEnvVars.env = result;
|
|
130
145
|
}
|
|
131
146
|
return resolvedEnvVars;
|
|
132
147
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/syncEnvVars.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"syncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/syncEnvVars.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,8 +38,7 @@ function syncVercelEnvVars(options) {
|
|
|
38
38
|
const params = new URLSearchParams({ decrypt: "true" });
|
|
39
39
|
if (vercelTeamId)
|
|
40
40
|
params.set("teamId", vercelTeamId);
|
|
41
|
-
|
|
42
|
-
params.set("gitBranch", branch);
|
|
41
|
+
params.set("target", vercelEnvironment);
|
|
43
42
|
const vercelApiUrl = `https://api.vercel.com/v8/projects/${projectId}/env?${params}`;
|
|
44
43
|
try {
|
|
45
44
|
const response = await fetch(vercelApiUrl, {
|
|
@@ -51,12 +50,16 @@ function syncVercelEnvVars(options) {
|
|
|
51
50
|
throw new Error(`HTTP error! status: ${response.status}`);
|
|
52
51
|
}
|
|
53
52
|
const data = await response.json();
|
|
53
|
+
const isBranchable = ctx.environment === "preview";
|
|
54
54
|
const filteredEnvs = data.envs
|
|
55
55
|
.filter((env) => env.value && env.target.includes(vercelEnvironment))
|
|
56
|
-
.map((env) =>
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
56
|
+
.map((env) => {
|
|
57
|
+
return {
|
|
58
|
+
name: env.key,
|
|
59
|
+
value: env.value,
|
|
60
|
+
isParentEnv: isBranchable && !env.gitBranch,
|
|
61
|
+
};
|
|
62
|
+
});
|
|
60
63
|
return filteredEnvs;
|
|
61
64
|
}
|
|
62
65
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vercelSyncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/vercelSyncEnvVars.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"vercelSyncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/vercelSyncEnvVars.ts"],"names":[],"mappings":"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"}
|
package/dist/commonjs/version.js
CHANGED
|
@@ -2,6 +2,7 @@ import { BuildExtension } from "@trigger.dev/core/v3/build";
|
|
|
2
2
|
export type SyncEnvVarsBody = Record<string, string> | Array<{
|
|
3
3
|
name: string;
|
|
4
4
|
value: string;
|
|
5
|
+
isParentEnv?: boolean;
|
|
5
6
|
}>;
|
|
6
7
|
export type SyncEnvVarsResult = SyncEnvVarsBody | Promise<void | undefined | SyncEnvVarsBody> | void | undefined;
|
|
7
8
|
export type SyncEnvVarsParams = {
|
|
@@ -60,18 +60,9 @@ export function syncEnvVars(fn, options) {
|
|
|
60
60
|
$spinner.stop("No env vars detected");
|
|
61
61
|
return;
|
|
62
62
|
}
|
|
63
|
-
const env =
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
}
|
|
67
|
-
// Strip out any TRIGGER_ prefix env vars
|
|
68
|
-
if (UNSYNCABLE_ENV_VARS_PREFIXES.some((prefix) => key.startsWith(prefix))) {
|
|
69
|
-
return acc;
|
|
70
|
-
}
|
|
71
|
-
acc[key] = value;
|
|
72
|
-
return acc;
|
|
73
|
-
}, {});
|
|
74
|
-
const numberOfEnvVars = Object.keys(env).length;
|
|
63
|
+
const env = stripUnsyncableEnvVars(result.env);
|
|
64
|
+
const parentEnv = result.parentEnv ? stripUnsyncableEnvVars(result.parentEnv) : undefined;
|
|
65
|
+
const numberOfEnvVars = Object.keys(env).length + (parentEnv ? Object.keys(parentEnv).length : 0);
|
|
75
66
|
if (numberOfEnvVars === 0) {
|
|
76
67
|
$spinner.stop("No env vars detected");
|
|
77
68
|
return;
|
|
@@ -86,15 +77,31 @@ export function syncEnvVars(fn, options) {
|
|
|
86
77
|
id: "sync-env-vars",
|
|
87
78
|
deploy: {
|
|
88
79
|
env,
|
|
80
|
+
parentEnv,
|
|
89
81
|
override: options?.override ?? true,
|
|
90
82
|
},
|
|
91
83
|
});
|
|
92
84
|
},
|
|
93
85
|
};
|
|
94
86
|
}
|
|
87
|
+
function stripUnsyncableEnvVars(env) {
|
|
88
|
+
return Object.entries(env).reduce((acc, [key, value]) => {
|
|
89
|
+
if (UNSYNCABLE_ENV_VARS.includes(key)) {
|
|
90
|
+
return acc;
|
|
91
|
+
}
|
|
92
|
+
// Strip out any TRIGGER_ prefix env vars
|
|
93
|
+
if (UNSYNCABLE_ENV_VARS_PREFIXES.some((prefix) => key.startsWith(prefix))) {
|
|
94
|
+
return acc;
|
|
95
|
+
}
|
|
96
|
+
acc[key] = value;
|
|
97
|
+
return acc;
|
|
98
|
+
}, {});
|
|
99
|
+
}
|
|
95
100
|
async function callSyncEnvVarsFn(syncEnvVarsFn, env, environment, branch, context) {
|
|
96
101
|
if (syncEnvVarsFn && typeof syncEnvVarsFn === "function") {
|
|
97
|
-
let resolvedEnvVars = {
|
|
102
|
+
let resolvedEnvVars = {
|
|
103
|
+
env: {},
|
|
104
|
+
};
|
|
98
105
|
let result;
|
|
99
106
|
try {
|
|
100
107
|
result = await syncEnvVarsFn({
|
|
@@ -118,12 +125,20 @@ async function callSyncEnvVarsFn(syncEnvVarsFn, env, environment, branch, contex
|
|
|
118
125
|
"value" in item &&
|
|
119
126
|
typeof item.name === "string" &&
|
|
120
127
|
typeof item.value === "string") {
|
|
121
|
-
|
|
128
|
+
if (item.isParentEnv) {
|
|
129
|
+
if (!resolvedEnvVars.parentEnv) {
|
|
130
|
+
resolvedEnvVars.parentEnv = {};
|
|
131
|
+
}
|
|
132
|
+
resolvedEnvVars.parentEnv[item.name] = item.value;
|
|
133
|
+
}
|
|
134
|
+
else {
|
|
135
|
+
resolvedEnvVars.env[item.name] = item.value;
|
|
136
|
+
}
|
|
122
137
|
}
|
|
123
138
|
}
|
|
124
139
|
}
|
|
125
140
|
else if (result) {
|
|
126
|
-
resolvedEnvVars = result;
|
|
141
|
+
resolvedEnvVars.env = result;
|
|
127
142
|
}
|
|
128
143
|
return resolvedEnvVars;
|
|
129
144
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/syncEnvVars.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"syncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/syncEnvVars.ts"],"names":[],"mappings":"AAmBA,MAAM,mBAAmB,GAAG;IAC1B,KAAK;IACL,gBAAgB;IAChB,MAAM;IACN,MAAM;IACN,sBAAsB;IACtB,cAAc;IACd,MAAM;IACN,SAAS;IACT,eAAe;IACf,eAAe;IACf,OAAO;IACP,OAAO;IACP,MAAM;IACN,yBAAyB;IACzB,kBAAkB;IAClB,WAAW;IACX,8BAA8B;IAC9B,cAAc;IACd,sBAAsB;IACtB,WAAW;IACX,aAAa;IACb,yBAAyB;IACzB,+BAA+B;IAC/B,yBAAyB;IACzB,uBAAuB;IACvB,kBAAkB;IAClB,SAAS;IACT,cAAc;IACd,MAAM;IACN,QAAQ;IACR,iBAAiB;IACjB,iBAAiB;IACjB,qBAAqB;IACrB,SAAS;IACT,UAAU;IACV,kBAAkB;IAClB,uBAAuB;IACvB,SAAS;IACT,cAAc;IACd,SAAS;IACT,SAAS;IACT,aAAa;IACb,cAAc;IACd,cAAc;IACd,QAAQ;IACR,GAAG;CACJ,CAAC;AAEF,MAAM,4BAA4B,GAAG,CAAC,UAAU,CAAC,CAAC;AAQlD,MAAM,UAAU,WAAW,CAAC,EAAuB,EAAE,OAA4B;IAC/E,OAAO;QACL,IAAI,EAAE,sBAAsB;QAC5B,KAAK,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ;YACrC,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;gBAC7B,OAAO;YACT,CAAC;YAED,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;YAEzE,MAAM,MAAM,GAAG,MAAM,iBAAiB,CACpC,EAAE,EACF,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,EACzB,QAAQ,CAAC,WAAW,EACpB,QAAQ,CAAC,MAAM,EACf,OAAO,CACR,CAAC;YAEF,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;gBAEtC,OAAO;YACT,CAAC;YAED,MAAM,GAAG,GAAG,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC/C,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,sBAAsB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAE1F,MAAM,eAAe,GACnB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAE5E,IAAI,eAAe,KAAK,CAAC,EAAE,CAAC;gBAC1B,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;gBAEtC,OAAO;YACT,CAAC;iBAAM,IAAI,eAAe,KAAK,CAAC,EAAE,CAAC;gBACjC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,CAAC,SAAS,eAAe,mBAAmB,CAAC,CAAC;YAC7D,CAAC;YAED,OAAO,CAAC,QAAQ,CAAC;gBACf,EAAE,EAAE,eAAe;gBACnB,MAAM,EAAE;oBACN,GAAG;oBACH,SAAS;oBACT,QAAQ,EAAE,OAAO,EAAE,QAAQ,IAAI,IAAI;iBACpC;aACF,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,GAA2B;IACzD,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAC/B,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACpB,IAAI,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACtC,OAAO,GAAG,CAAC;QACb,CAAC;QAED,yCAAyC;QACzC,IAAI,4BAA4B,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YAC1E,OAAO,GAAG,CAAC;QACb,CAAC;QAED,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACjB,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAA4B,CAC7B,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,aAA8C,EAC9C,GAA2B,EAC3B,WAAmB,EACnB,MAA0B,EAC1B,OAAqB;IAErB,IAAI,aAAa,IAAI,OAAO,aAAa,KAAK,UAAU,EAAE,CAAC;QACzD,IAAI,eAAe,GAAwE;YACzF,GAAG,EAAE,EAAE;SACR,CAAC;QACF,IAAI,MAAM,CAAC;QAEX,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,aAAa,CAAC;gBAC3B,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO;gBAClC,WAAW;gBACX,GAAG;gBACH,MAAM;aACP,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;QACnE,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO;QACT,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;gBAC1B,IACE,OAAO,IAAI,KAAK,QAAQ;oBACxB,IAAI,KAAK,IAAI;oBACb,MAAM,IAAI,IAAI;oBACd,OAAO,IAAI,IAAI;oBACf,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ;oBAC7B,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAC9B,CAAC;oBACD,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;wBACrB,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC;4BAC/B,eAAe,CAAC,SAAS,GAAG,EAAE,CAAC;wBACjC,CAAC;wBACD,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;oBACpD,CAAC;yBAAM,CAAC;wBACN,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;oBAC9C,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,MAAM,EAAE,CAAC;YAClB,eAAe,CAAC,GAAG,GAAG,MAAM,CAAC;QAC/B,CAAC;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,OAAO;AACT,CAAC"}
|
|
@@ -35,8 +35,7 @@ export function syncVercelEnvVars(options) {
|
|
|
35
35
|
const params = new URLSearchParams({ decrypt: "true" });
|
|
36
36
|
if (vercelTeamId)
|
|
37
37
|
params.set("teamId", vercelTeamId);
|
|
38
|
-
|
|
39
|
-
params.set("gitBranch", branch);
|
|
38
|
+
params.set("target", vercelEnvironment);
|
|
40
39
|
const vercelApiUrl = `https://api.vercel.com/v8/projects/${projectId}/env?${params}`;
|
|
41
40
|
try {
|
|
42
41
|
const response = await fetch(vercelApiUrl, {
|
|
@@ -48,12 +47,16 @@ export function syncVercelEnvVars(options) {
|
|
|
48
47
|
throw new Error(`HTTP error! status: ${response.status}`);
|
|
49
48
|
}
|
|
50
49
|
const data = await response.json();
|
|
50
|
+
const isBranchable = ctx.environment === "preview";
|
|
51
51
|
const filteredEnvs = data.envs
|
|
52
52
|
.filter((env) => env.value && env.target.includes(vercelEnvironment))
|
|
53
|
-
.map((env) =>
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
53
|
+
.map((env) => {
|
|
54
|
+
return {
|
|
55
|
+
name: env.key,
|
|
56
|
+
value: env.value,
|
|
57
|
+
isParentEnv: isBranchable && !env.gitBranch,
|
|
58
|
+
};
|
|
59
|
+
});
|
|
57
60
|
return filteredEnvs;
|
|
58
61
|
}
|
|
59
62
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vercelSyncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/vercelSyncEnvVars.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"vercelSyncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/vercelSyncEnvVars.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = "0.0.0-re2-
|
|
1
|
+
export const VERSION = "0.0.0-re2-20250529112227";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trigger.dev/build",
|
|
3
|
-
"version": "0.0.0-re2-
|
|
3
|
+
"version": "0.0.0-re2-20250529112227",
|
|
4
4
|
"description": "trigger.dev build extensions",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
}
|
|
66
66
|
},
|
|
67
67
|
"dependencies": {
|
|
68
|
-
"@trigger.dev/core": "0.0.0-re2-
|
|
68
|
+
"@trigger.dev/core": "0.0.0-re2-20250529112227",
|
|
69
69
|
"pkg-types": "^1.1.3",
|
|
70
70
|
"tinyglobby": "^0.2.2",
|
|
71
71
|
"tsconfck": "3.1.3"
|