@trigger.dev/build 4.0.0-v4-beta.18 → 4.0.0-v4-beta.19

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.
@@ -2,11 +2,13 @@ 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 = {
8
9
  projectRef: string;
9
10
  environment: string;
11
+ branch?: string;
10
12
  env: Record<string, string>;
11
13
  };
12
14
  export type SyncEnvVarsFunction = (params: SyncEnvVarsParams) => SyncEnvVarsResult;
@@ -58,23 +58,14 @@ function syncEnvVars(fn, options) {
58
58
  return;
59
59
  }
60
60
  const $spinner = context.logger.spinner("Invoking syncEnvVars callback");
61
- const result = await callSyncEnvVarsFn(fn, manifest.deploy.env ?? {}, manifest.environment, context);
61
+ const result = await callSyncEnvVarsFn(fn, manifest.deploy.env ?? {}, manifest.environment, manifest.branch, context);
62
62
  if (!result) {
63
63
  $spinner.stop("No env vars detected");
64
64
  return;
65
65
  }
66
- const env = Object.entries(result).reduce((acc, [key, value]) => {
67
- if (UNSYNCABLE_ENV_VARS.includes(key)) {
68
- return acc;
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,21 +80,38 @@ 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
  }
98
- async function callSyncEnvVarsFn(syncEnvVarsFn, env, environment, context) {
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
+ }
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({
104
111
  projectRef: context.config.project,
105
112
  environment,
106
113
  env,
114
+ branch,
107
115
  });
108
116
  }
109
117
  catch (error) {
@@ -120,12 +128,20 @@ async function callSyncEnvVarsFn(syncEnvVarsFn, env, environment, context) {
120
128
  "value" in item &&
121
129
  typeof item.name === "string" &&
122
130
  typeof item.value === "string") {
123
- resolvedEnvVars[item.name] = item.value;
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
+ }
124
140
  }
125
141
  }
126
142
  }
127
143
  else if (result) {
128
- resolvedEnvVars = result;
144
+ resolvedEnvVars.env = result;
129
145
  }
130
146
  return resolvedEnvVars;
131
147
  }
@@ -1 +1 @@
1
- {"version":3,"file":"syncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/syncEnvVars.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"syncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/syncEnvVars.ts"],"names":[],"mappings":"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"}
@@ -3,4 +3,5 @@ export declare function syncVercelEnvVars(options?: {
3
3
  projectId?: string;
4
4
  vercelAccessToken?: string;
5
5
  vercelTeamId?: string;
6
+ branch?: string;
6
7
  }): BuildExtension;
@@ -4,13 +4,16 @@ exports.syncVercelEnvVars = syncVercelEnvVars;
4
4
  const core_js_1 = require("../core.js");
5
5
  function syncVercelEnvVars(options) {
6
6
  const sync = (0, core_js_1.syncEnvVars)(async (ctx) => {
7
- const projectId = options?.projectId ?? process.env.VERCEL_PROJECT_ID ??
8
- ctx.env.VERCEL_PROJECT_ID;
7
+ const projectId = options?.projectId ?? process.env.VERCEL_PROJECT_ID ?? ctx.env.VERCEL_PROJECT_ID;
9
8
  const vercelAccessToken = options?.vercelAccessToken ??
10
9
  process.env.VERCEL_ACCESS_TOKEN ??
11
- ctx.env.VERCEL_ACCESS_TOKEN;
12
- const vercelTeamId = options?.vercelTeamId ?? process.env.VERCEL_TEAM_ID ??
13
- ctx.env.VERCEL_TEAM_ID;
10
+ ctx.env.VERCEL_ACCESS_TOKEN ??
11
+ process.env.VERCEL_TOKEN;
12
+ const vercelTeamId = options?.vercelTeamId ?? process.env.VERCEL_TEAM_ID ?? ctx.env.VERCEL_TEAM_ID;
13
+ const branch = options?.branch ??
14
+ process.env.VERCEL_PREVIEW_BRANCH ??
15
+ ctx.env.VERCEL_PREVIEW_BRANCH ??
16
+ ctx.branch;
14
17
  if (!projectId) {
15
18
  throw new Error("syncVercelEnvVars: you did not pass in a projectId or set the VERCEL_PROJECT_ID env var.");
16
19
  }
@@ -21,6 +24,7 @@ function syncVercelEnvVars(options) {
21
24
  prod: "production",
22
25
  staging: "preview",
23
26
  dev: "development",
27
+ preview: "preview",
24
28
  };
25
29
  const vercelEnvironment = environmentMap[ctx.environment];
26
30
  if (!vercelEnvironment) {
@@ -29,6 +33,7 @@ function syncVercelEnvVars(options) {
29
33
  const params = new URLSearchParams({ decrypt: "true" });
30
34
  if (vercelTeamId)
31
35
  params.set("teamId", vercelTeamId);
36
+ params.set("target", vercelEnvironment);
32
37
  const vercelApiUrl = `https://api.vercel.com/v8/projects/${projectId}/env?${params}`;
33
38
  try {
34
39
  const response = await fetch(vercelApiUrl, {
@@ -40,13 +45,16 @@ function syncVercelEnvVars(options) {
40
45
  throw new Error(`HTTP error! status: ${response.status}`);
41
46
  }
42
47
  const data = await response.json();
48
+ const isBranchable = ctx.environment === "preview";
43
49
  const filteredEnvs = data.envs
44
- .filter((env) => env.value &&
45
- env.target.includes(vercelEnvironment))
46
- .map((env) => ({
47
- name: env.key,
48
- value: env.value,
49
- }));
50
+ .filter((env) => env.value && env.target.includes(vercelEnvironment))
51
+ .map((env) => {
52
+ return {
53
+ name: env.key,
54
+ value: env.value,
55
+ isParentEnv: isBranchable && !env.gitBranch,
56
+ };
57
+ });
50
58
  return filteredEnvs;
51
59
  }
52
60
  catch (error) {
@@ -1 +1 @@
1
- {"version":3,"file":"vercelSyncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/vercelSyncEnvVars.ts"],"names":[],"mappings":";;AAGA,8CAuFC;AAzFD,wCAAyC;AAEzC,SAAgB,iBAAiB,CAC/B,OAIC;IAED,MAAM,IAAI,GAAG,IAAA,qBAAW,EAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACrC,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACnE,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC;QAC5B,MAAM,iBAAiB,GAAG,OAAO,EAAE,iBAAiB;YAClD,OAAO,CAAC,GAAG,CAAC,mBAAmB;YAC/B,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC;QAC9B,MAAM,YAAY,GAAG,OAAO,EAAE,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc;YACtE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;QAEzB,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,0FAA0F,CAC3F,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,oGAAoG,CACrG,CAAC;QACJ,CAAC;QAED,MAAM,cAAc,GAAG;YACrB,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,SAAS;YAClB,GAAG,EAAE,aAAa;SACV,CAAC;QAEX,MAAM,iBAAiB,GACrB,cAAc,CAAC,GAAG,CAAC,WAA0C,CAAC,CAAC;QAEjE,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,wBAAwB,GAAG,CAAC,WAAW,0CAA0C,CAClF,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACxD,IAAI,YAAY;YAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QACrD,MAAM,YAAY,GAChB,sCAAsC,SAAS,QAAQ,MAAM,EAAE,CAAC;QAElE,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,YAAY,EAAE;gBACzC,OAAO,EAAE;oBACP,aAAa,EAAE,UAAU,iBAAiB,EAAE;iBAC7C;aACF,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;YAC5D,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAEnC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI;iBAC3B,MAAM,CACL,CAAC,GAAsD,EAAE,EAAE,CACzD,GAAG,CAAC,KAAK;gBACT,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CACzC;iBACA,GAAG,CAAC,CAAC,GAAmC,EAAE,EAAE,CAAC,CAAC;gBAC7C,IAAI,EAAE,GAAG,CAAC,GAAG;gBACb,KAAK,EAAE,GAAG,CAAC,KAAK;aACjB,CAAC,CAAC,CAAC;YAEN,OAAO,YAAY,CAAC;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CACX,4DAA4D,EAC5D,KAAK,CACN,CAAC;YACF,MAAM,KAAK,CAAC,CAAC,iDAAiD;QAChE,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,EAAE,4BAA4B;QAClC,KAAK,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ;YACrC,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAClD,CAAC;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"vercelSyncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/vercelSyncEnvVars.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.VERSION = void 0;
4
- exports.VERSION = "4.0.0-v4-beta.18";
4
+ exports.VERSION = "4.0.0-v4-beta.19";
5
5
  //# sourceMappingURL=version.js.map
@@ -2,11 +2,13 @@ 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 = {
8
9
  projectRef: string;
9
10
  environment: string;
11
+ branch?: string;
10
12
  env: Record<string, string>;
11
13
  };
12
14
  export type SyncEnvVarsFunction = (params: SyncEnvVarsParams) => SyncEnvVarsResult;
@@ -55,23 +55,14 @@ export function syncEnvVars(fn, options) {
55
55
  return;
56
56
  }
57
57
  const $spinner = context.logger.spinner("Invoking syncEnvVars callback");
58
- const result = await callSyncEnvVarsFn(fn, manifest.deploy.env ?? {}, manifest.environment, context);
58
+ const result = await callSyncEnvVarsFn(fn, manifest.deploy.env ?? {}, manifest.environment, manifest.branch, context);
59
59
  if (!result) {
60
60
  $spinner.stop("No env vars detected");
61
61
  return;
62
62
  }
63
- const env = Object.entries(result).reduce((acc, [key, value]) => {
64
- if (UNSYNCABLE_ENV_VARS.includes(key)) {
65
- return acc;
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,21 +77,38 @@ 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
  }
95
- async function callSyncEnvVarsFn(syncEnvVarsFn, env, environment, context) {
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
+ }
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({
101
108
  projectRef: context.config.project,
102
109
  environment,
103
110
  env,
111
+ branch,
104
112
  });
105
113
  }
106
114
  catch (error) {
@@ -117,12 +125,20 @@ async function callSyncEnvVarsFn(syncEnvVarsFn, env, environment, context) {
117
125
  "value" in item &&
118
126
  typeof item.name === "string" &&
119
127
  typeof item.value === "string") {
120
- resolvedEnvVars[item.name] = item.value;
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
+ }
121
137
  }
122
138
  }
123
139
  }
124
140
  else if (result) {
125
- resolvedEnvVars = result;
141
+ resolvedEnvVars.env = result;
126
142
  }
127
143
  return resolvedEnvVars;
128
144
  }
@@ -1 +1 @@
1
- {"version":3,"file":"syncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/syncEnvVars.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"syncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/syncEnvVars.ts"],"names":[],"mappings":"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"}
@@ -3,4 +3,5 @@ export declare function syncVercelEnvVars(options?: {
3
3
  projectId?: string;
4
4
  vercelAccessToken?: string;
5
5
  vercelTeamId?: string;
6
+ branch?: string;
6
7
  }): BuildExtension;
@@ -1,13 +1,16 @@
1
1
  import { syncEnvVars } from "../core.js";
2
2
  export function syncVercelEnvVars(options) {
3
3
  const sync = syncEnvVars(async (ctx) => {
4
- const projectId = options?.projectId ?? process.env.VERCEL_PROJECT_ID ??
5
- ctx.env.VERCEL_PROJECT_ID;
4
+ const projectId = options?.projectId ?? process.env.VERCEL_PROJECT_ID ?? ctx.env.VERCEL_PROJECT_ID;
6
5
  const vercelAccessToken = options?.vercelAccessToken ??
7
6
  process.env.VERCEL_ACCESS_TOKEN ??
8
- ctx.env.VERCEL_ACCESS_TOKEN;
9
- const vercelTeamId = options?.vercelTeamId ?? process.env.VERCEL_TEAM_ID ??
10
- ctx.env.VERCEL_TEAM_ID;
7
+ ctx.env.VERCEL_ACCESS_TOKEN ??
8
+ process.env.VERCEL_TOKEN;
9
+ const vercelTeamId = options?.vercelTeamId ?? process.env.VERCEL_TEAM_ID ?? ctx.env.VERCEL_TEAM_ID;
10
+ const branch = options?.branch ??
11
+ process.env.VERCEL_PREVIEW_BRANCH ??
12
+ ctx.env.VERCEL_PREVIEW_BRANCH ??
13
+ ctx.branch;
11
14
  if (!projectId) {
12
15
  throw new Error("syncVercelEnvVars: you did not pass in a projectId or set the VERCEL_PROJECT_ID env var.");
13
16
  }
@@ -18,6 +21,7 @@ export function syncVercelEnvVars(options) {
18
21
  prod: "production",
19
22
  staging: "preview",
20
23
  dev: "development",
24
+ preview: "preview",
21
25
  };
22
26
  const vercelEnvironment = environmentMap[ctx.environment];
23
27
  if (!vercelEnvironment) {
@@ -26,6 +30,7 @@ export function syncVercelEnvVars(options) {
26
30
  const params = new URLSearchParams({ decrypt: "true" });
27
31
  if (vercelTeamId)
28
32
  params.set("teamId", vercelTeamId);
33
+ params.set("target", vercelEnvironment);
29
34
  const vercelApiUrl = `https://api.vercel.com/v8/projects/${projectId}/env?${params}`;
30
35
  try {
31
36
  const response = await fetch(vercelApiUrl, {
@@ -37,13 +42,16 @@ export function syncVercelEnvVars(options) {
37
42
  throw new Error(`HTTP error! status: ${response.status}`);
38
43
  }
39
44
  const data = await response.json();
45
+ const isBranchable = ctx.environment === "preview";
40
46
  const filteredEnvs = data.envs
41
- .filter((env) => env.value &&
42
- env.target.includes(vercelEnvironment))
43
- .map((env) => ({
44
- name: env.key,
45
- value: env.value,
46
- }));
47
+ .filter((env) => env.value && env.target.includes(vercelEnvironment))
48
+ .map((env) => {
49
+ return {
50
+ name: env.key,
51
+ value: env.value,
52
+ isParentEnv: isBranchable && !env.gitBranch,
53
+ };
54
+ });
47
55
  return filteredEnvs;
48
56
  }
49
57
  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;AAEzC,MAAM,UAAU,iBAAiB,CAC/B,OAIC;IAED,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACrC,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACnE,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC;QAC5B,MAAM,iBAAiB,GAAG,OAAO,EAAE,iBAAiB;YAClD,OAAO,CAAC,GAAG,CAAC,mBAAmB;YAC/B,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC;QAC9B,MAAM,YAAY,GAAG,OAAO,EAAE,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc;YACtE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;QAEzB,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,0FAA0F,CAC3F,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,oGAAoG,CACrG,CAAC;QACJ,CAAC;QAED,MAAM,cAAc,GAAG;YACrB,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,SAAS;YAClB,GAAG,EAAE,aAAa;SACV,CAAC;QAEX,MAAM,iBAAiB,GACrB,cAAc,CAAC,GAAG,CAAC,WAA0C,CAAC,CAAC;QAEjE,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,wBAAwB,GAAG,CAAC,WAAW,0CAA0C,CAClF,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACxD,IAAI,YAAY;YAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QACrD,MAAM,YAAY,GAChB,sCAAsC,SAAS,QAAQ,MAAM,EAAE,CAAC;QAElE,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,YAAY,EAAE;gBACzC,OAAO,EAAE;oBACP,aAAa,EAAE,UAAU,iBAAiB,EAAE;iBAC7C;aACF,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;YAC5D,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAEnC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI;iBAC3B,MAAM,CACL,CAAC,GAAsD,EAAE,EAAE,CACzD,GAAG,CAAC,KAAK;gBACT,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CACzC;iBACA,GAAG,CAAC,CAAC,GAAmC,EAAE,EAAE,CAAC,CAAC;gBAC7C,IAAI,EAAE,GAAG,CAAC,GAAG;gBACb,KAAK,EAAE,GAAG,CAAC,KAAK;aACjB,CAAC,CAAC,CAAC;YAEN,OAAO,YAAY,CAAC;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CACX,4DAA4D,EAC5D,KAAK,CACN,CAAC;YACF,MAAM,KAAK,CAAC,CAAC,iDAAiD;QAChE,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,EAAE,4BAA4B;QAClC,KAAK,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ;YACrC,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAClD,CAAC;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"vercelSyncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/vercelSyncEnvVars.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,2 @@
1
- export const VERSION = "4.0.0-v4-beta.18";
1
+ export const VERSION = "4.0.0-v4-beta.19";
2
2
  //# sourceMappingURL=version.js.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trigger.dev/build",
3
- "version": "4.0.0-v4-beta.18",
3
+ "version": "4.0.0-v4-beta.19",
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": "4.0.0-v4-beta.18",
68
+ "@trigger.dev/core": "4.0.0-v4-beta.19",
69
69
  "pkg-types": "^1.1.3",
70
70
  "tinyglobby": "^0.2.2",
71
71
  "tsconfck": "3.1.3"