@trigger.dev/build 0.0.0-prerelease-20260508094307 → 0.0.0-prerelease-deployment-base-image-20260814120901
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/neonSyncEnvVars.js.map +1 -1
- package/dist/commonjs/extensions/core/syncEnvVars.d.ts +1 -0
- package/dist/commonjs/extensions/core/syncEnvVars.js +21 -4
- package/dist/commonjs/extensions/core/syncEnvVars.js.map +1 -1
- package/dist/commonjs/extensions/core/syncEnvVars.test.d.ts +1 -0
- package/dist/commonjs/extensions/core/syncEnvVars.test.js +52 -0
- package/dist/commonjs/extensions/core/syncEnvVars.test.js.map +1 -0
- package/dist/commonjs/extensions/core/syncSupabaseEnvVars.js.map +1 -1
- package/dist/commonjs/extensions/core/vercelSyncEnvVars.js +1 -1
- package/dist/commonjs/extensions/core/vercelSyncEnvVars.js.map +1 -1
- package/dist/commonjs/extensions/internal/loadTypescript.d.ts +2 -0
- package/dist/commonjs/extensions/internal/loadTypescript.js +62 -0
- package/dist/commonjs/extensions/internal/loadTypescript.js.map +1 -0
- package/dist/commonjs/extensions/internal/loadTypescript.test.d.ts +1 -0
- package/dist/commonjs/extensions/internal/loadTypescript.test.js +98 -0
- package/dist/commonjs/extensions/internal/loadTypescript.test.js.map +1 -0
- package/dist/commonjs/extensions/typescript.js +9 -10
- package/dist/commonjs/extensions/typescript.js.map +1 -1
- package/dist/commonjs/internal/additionalFiles.js +5 -49
- package/dist/commonjs/internal/additionalFiles.js.map +1 -1
- package/dist/commonjs/internal/copyFiles.d.ts +45 -0
- package/dist/commonjs/internal/copyFiles.js +76 -0
- package/dist/commonjs/internal/copyFiles.js.map +1 -0
- package/dist/commonjs/internal.d.ts +1 -0
- package/dist/commonjs/internal.js +1 -0
- package/dist/commonjs/internal.js.map +1 -1
- package/dist/commonjs/version.js +1 -1
- package/dist/esm/extensions/core/neonSyncEnvVars.js.map +1 -1
- package/dist/esm/extensions/core/syncEnvVars.d.ts +1 -0
- package/dist/esm/extensions/core/syncEnvVars.js +21 -4
- package/dist/esm/extensions/core/syncEnvVars.js.map +1 -1
- package/dist/esm/extensions/core/syncEnvVars.test.d.ts +1 -0
- package/dist/esm/extensions/core/syncEnvVars.test.js +50 -0
- package/dist/esm/extensions/core/syncEnvVars.test.js.map +1 -0
- package/dist/esm/extensions/core/syncSupabaseEnvVars.js.map +1 -1
- package/dist/esm/extensions/core/vercelSyncEnvVars.js +1 -1
- package/dist/esm/extensions/core/vercelSyncEnvVars.js.map +1 -1
- package/dist/esm/extensions/internal/loadTypescript.d.ts +2 -0
- package/dist/esm/extensions/internal/loadTypescript.js +59 -0
- package/dist/esm/extensions/internal/loadTypescript.js.map +1 -0
- package/dist/esm/extensions/internal/loadTypescript.test.d.ts +1 -0
- package/dist/esm/extensions/internal/loadTypescript.test.js +96 -0
- package/dist/esm/extensions/internal/loadTypescript.test.js.map +1 -0
- package/dist/esm/extensions/typescript.js +9 -7
- package/dist/esm/extensions/typescript.js.map +1 -1
- package/dist/esm/internal/additionalFiles.js +5 -49
- package/dist/esm/internal/additionalFiles.js.map +1 -1
- package/dist/esm/internal/copyFiles.d.ts +45 -0
- package/dist/esm/internal/copyFiles.js +70 -0
- package/dist/esm/internal/copyFiles.js.map +1 -0
- package/dist/esm/internal.d.ts +1 -0
- package/dist/esm/internal.js +1 -0
- package/dist/esm/internal.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +23 -6
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.findFilesByMatchers = findFilesByMatchers;
|
|
4
|
+
exports.copyFileEnsuringDir = copyFileEnsuringDir;
|
|
5
|
+
exports.copyMatcherResults = copyMatcherResults;
|
|
6
|
+
exports.copyDirectoryRecursive = copyDirectoryRecursive;
|
|
7
|
+
const promises_1 = require("node:fs/promises");
|
|
8
|
+
const node_path_1 = require("node:path");
|
|
9
|
+
const tinyglobby_1 = require("tinyglobby");
|
|
10
|
+
/**
|
|
11
|
+
* Glob a set of matchers relative to `cwd` and return pairs describing
|
|
12
|
+
* where each matched file should be copied to under `destinationDir`.
|
|
13
|
+
*
|
|
14
|
+
* Relative paths are preserved under `destinationDir`. Leading `..`
|
|
15
|
+
* segments (from `../shared/file.txt` style patterns) are stripped so
|
|
16
|
+
* files always land inside the destination.
|
|
17
|
+
*/
|
|
18
|
+
async function findFilesByMatchers(matchers, destinationDir, options) {
|
|
19
|
+
const result = [];
|
|
20
|
+
const cwd = options?.cwd ?? process.cwd();
|
|
21
|
+
for (const matcher of matchers) {
|
|
22
|
+
const files = await (0, tinyglobby_1.glob)({
|
|
23
|
+
patterns: [matcher],
|
|
24
|
+
cwd,
|
|
25
|
+
ignore: options?.ignore ?? [],
|
|
26
|
+
onlyFiles: true,
|
|
27
|
+
absolute: true,
|
|
28
|
+
});
|
|
29
|
+
const assets = files.map((file) => {
|
|
30
|
+
const pathInsideDestinationDir = (0, node_path_1.relative)(cwd, file)
|
|
31
|
+
.split(node_path_1.posix.sep)
|
|
32
|
+
.filter((p) => p !== "..")
|
|
33
|
+
.join(node_path_1.posix.sep);
|
|
34
|
+
return {
|
|
35
|
+
source: file,
|
|
36
|
+
destination: (0, node_path_1.join)(destinationDir, pathInsideDestinationDir),
|
|
37
|
+
};
|
|
38
|
+
});
|
|
39
|
+
result.push({ matcher, assets });
|
|
40
|
+
}
|
|
41
|
+
return result;
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Copy a single file, creating parent directories as needed.
|
|
45
|
+
*/
|
|
46
|
+
async function copyFileEnsuringDir(source, destination) {
|
|
47
|
+
await (0, promises_1.mkdir)((0, node_path_1.dirname)(destination), { recursive: true });
|
|
48
|
+
await (0, promises_1.copyFile)(source, destination);
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* Copy every pair in the given matcher results. Parent directories are
|
|
52
|
+
* created automatically. Returns the total number of files copied.
|
|
53
|
+
*/
|
|
54
|
+
async function copyMatcherResults(matcherResults, onCopy) {
|
|
55
|
+
let count = 0;
|
|
56
|
+
for (const { assets } of matcherResults) {
|
|
57
|
+
for (const pair of assets) {
|
|
58
|
+
onCopy?.(pair);
|
|
59
|
+
await copyFileEnsuringDir(pair.source, pair.destination);
|
|
60
|
+
count++;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
return count;
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* Recursively copy a directory to another location. Preserves structure;
|
|
67
|
+
* overwrites existing files at the destination.
|
|
68
|
+
*
|
|
69
|
+
* Used by the built-in skill bundler — we copy entire skill folders as a
|
|
70
|
+
* unit, not file-by-file.
|
|
71
|
+
*/
|
|
72
|
+
async function copyDirectoryRecursive(source, destination) {
|
|
73
|
+
await (0, promises_1.mkdir)(destination, { recursive: true });
|
|
74
|
+
await (0, promises_1.cp)(source, destination, { recursive: true, force: true });
|
|
75
|
+
}
|
|
76
|
+
//# sourceMappingURL=copyFiles.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"copyFiles.js","sourceRoot":"","sources":["../../../src/internal/copyFiles.ts"],"names":[],"mappings":";;AA2BA,kDAgCC;AAKD,kDAGC;AAMD,gDAaC;AASD,wDAGC;AAlGD,+CAAuD;AACvD,yCAA2D;AAC3D,2CAAkC;AAiBlC;;;;;;;GAOG;AACI,KAAK,UAAU,mBAAmB,CACvC,QAAkB,EAClB,cAAsB,EACtB,OAA6C;IAE7C,MAAM,MAAM,GAAoB,EAAE,CAAC;IACnC,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAE1C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,MAAM,IAAA,iBAAI,EAAC;YACvB,QAAQ,EAAE,CAAC,OAAO,CAAC;YACnB,GAAG;YACH,MAAM,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE;YAC7B,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,MAAM,MAAM,GAAe,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAC5C,MAAM,wBAAwB,GAAG,IAAA,oBAAQ,EAAC,GAAG,EAAE,IAAI,CAAC;iBACjD,KAAK,CAAC,iBAAK,CAAC,GAAG,CAAC;iBAChB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;iBACzB,IAAI,CAAC,iBAAK,CAAC,GAAG,CAAC,CAAC;YACnB,OAAO;gBACL,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,IAAA,gBAAI,EAAC,cAAc,EAAE,wBAAwB,CAAC;aAC5D,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,mBAAmB,CAAC,MAAc,EAAE,WAAmB;IAC3E,MAAM,IAAA,gBAAK,EAAC,IAAA,mBAAO,EAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACvD,MAAM,IAAA,mBAAQ,EAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AACtC,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,kBAAkB,CACtC,cAA+B,EAC/B,MAAiC;IAEjC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,EAAE,MAAM,EAAE,IAAI,cAAc,EAAE,CAAC;QACxC,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;YAC1B,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC;YACf,MAAM,mBAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YACzD,KAAK,EAAE,CAAC;QACV,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,sBAAsB,CAAC,MAAc,EAAE,WAAmB;IAC9E,MAAM,IAAA,gBAAK,EAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9C,MAAM,IAAA,aAAE,EAAC,MAAM,EAAE,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAClE,CAAC"}
|
|
@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./internal/additionalFiles.js"), exports);
|
|
18
|
+
__exportStar(require("./internal/copyFiles.js"), exports);
|
|
18
19
|
//# sourceMappingURL=internal.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../src/internal.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gEAA8C"}
|
|
1
|
+
{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../src/internal.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gEAA8C;AAC9C,0DAAwC"}
|
package/dist/commonjs/version.js
CHANGED
|
@@ -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 = "0.0.0-prerelease-
|
|
4
|
+
exports.VERSION = "0.0.0-prerelease-deployment-base-image-20260814120901";
|
|
5
5
|
//# sourceMappingURL=version.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"neonSyncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/neonSyncEnvVars.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AA0BzC,wDAAwD;AACxD,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,QAAQ;IACR,qBAAqB;IACrB,eAAe;IACf,cAAc;IACd,qBAAqB;IACrB,uBAAuB;IACvB,0BAA0B;IAC1B,QAAQ;IACR,eAAe;IACf,cAAc;IACd,mBAAmB;IACnB,mBAAmB;IACnB,YAAY;IACZ,YAAY;IACZ,iBAAiB;CAClB,CAAC;AAEF,SAAS,uBAAuB,CAAC,OAMhC;IACC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAE/D,OAAO;QACL,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,QAAQ;QACpB,UAAU,EAAE,QAAQ;QACpB,MAAM,EAAE,UAAU;QAClB,eAAe,EAAE,IAAI;QACrB,aAAa,EAAE,IAAI;QACnB,iBAAiB,EAAE,QAAQ;QAC3B,iBAAiB,EAAE,QAAQ;QAC3B,aAAa,EAAE,UAAU;QACzB,YAAY,EAAE,gBAAgB,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,IAAI,UAAU,IAAI,QAAQ,kBAAkB;QAClI,qBAAqB,EAAE,gBAAgB,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,QAAQ,kBAAkB;QACrI,YAAY,EAAE,gBAAgB,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,IAAI,UAAU,IAAI,QAAQ,kBAAkB;QAClI,mBAAmB,EAAE,gBAAgB,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,IAAI,UAAU,IAAI,QAAQ,EAAE;QACzH,wBAAwB,EAAE,gBAAgB,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,QAAQ,kBAAkB;QACxI,mBAAmB,EAAE,gBAAgB,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,IAAI,UAAU,IAAI,QAAQ,oDAAoD;KAC5K,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAW/B;IACC,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACrC,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"neonSyncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/neonSyncEnvVars.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AA0BzC,wDAAwD;AACxD,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,QAAQ;IACR,qBAAqB;IACrB,eAAe;IACf,cAAc;IACd,qBAAqB;IACrB,uBAAuB;IACvB,0BAA0B;IAC1B,QAAQ;IACR,eAAe;IACf,cAAc;IACd,mBAAmB;IACnB,mBAAmB;IACnB,YAAY;IACZ,YAAY;IACZ,iBAAiB;CAClB,CAAC;AAEF,SAAS,uBAAuB,CAAC,OAMhC;IACC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAE/D,OAAO;QACL,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,QAAQ;QACpB,UAAU,EAAE,QAAQ;QACpB,MAAM,EAAE,UAAU;QAClB,eAAe,EAAE,IAAI;QACrB,aAAa,EAAE,IAAI;QACnB,iBAAiB,EAAE,QAAQ;QAC3B,iBAAiB,EAAE,QAAQ;QAC3B,aAAa,EAAE,UAAU;QACzB,YAAY,EAAE,gBAAgB,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,IAAI,UAAU,IAAI,QAAQ,kBAAkB;QAClI,qBAAqB,EAAE,gBAAgB,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,QAAQ,kBAAkB;QACrI,YAAY,EAAE,gBAAgB,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,IAAI,UAAU,IAAI,QAAQ,kBAAkB;QAClI,mBAAmB,EAAE,gBAAgB,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,IAAI,UAAU,IAAI,QAAQ,EAAE;QACzH,wBAAwB,EAAE,gBAAgB,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,QAAQ,kBAAkB;QACxI,mBAAmB,EAAE,gBAAgB,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,IAAI,UAAU,IAAI,QAAQ,oDAAoD;KAC5K,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAW/B;IACC,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACrC,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC;QAC/F,MAAM,eAAe,GACnB,OAAO,EAAE,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC;QACzF,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC;QAC7C,MAAM,YAAY,GAAG,OAAO,EAAE,YAAY,IAAI,EAAE,CAAC;QACjD,MAAM,aAAa,GAAG,aAAa,CAAC;QAEpC,iDAAiD;QACjD,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,sFAAsF,CACvF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CACb,+FAA+F,CAChG,CAAC;QACJ,CAAC;QAED,wDAAwD;QACxD,IAAI,GAAG,CAAC,WAAW,KAAK,MAAM,EAAE,CAAC;YAC/B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CACb,wFAAwF,CACzF,CAAC;QACJ,CAAC;QAED,MAAM,cAAc,GAAG;YACrB,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,SAAS;YAClB,GAAG,EAAE,aAAa;YAClB,OAAO,EAAE,SAAS;SACV,CAAC;QAEX,MAAM,WAAW,GAAG,cAAc,CAAC,GAAG,CAAC,WAA0C,CAAC,CAAC;QAEnF,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CACb,wBAAwB,GAAG,CAAC,WAAW,qDAAqD,CAC7F,CAAC;QACJ,CAAC;QAED,IAAI,WAAW,KAAK,aAAa,EAAE,CAAC;YAClC,2CAA2C;YAC3C,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,CAAC;YACH,wCAAwC;YACxC,MAAM,kBAAkB,GAAG,IAAI,eAAe,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;YACnE,MAAM,WAAW,GAAG,6CAA6C,SAAS,aAAa,kBAAkB,EAAE,CAAC;YAC5G,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,WAAW,EAAE;gBAChD,OAAO,EAAE;oBACP,aAAa,EAAE,UAAU,eAAe,EAAE;iBAC3C;aACF,CAAC,CAAC;YAEH,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,CAAC;gBACzB,MAAM,IAAI,KAAK,CAAC,kCAAkC,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC;YAC/E,CAAC;YAED,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,CAAC;YACnD,MAAM,QAAQ,GAAiB,YAAY,CAAC,QAAQ,IAAI,EAAE,CAAC;YAE3D,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC1B,2BAA2B;gBAC3B,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,gFAAgF;YAChF,MAAM,kBAAkB,GAAG,GAAG,WAAW,IAAI,MAAM,EAAE,CAAC;YACtD,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CAClC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,kBAAkB,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,CAC1D,CAAC;YAEF,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,uBAAuB;gBACvB,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,MAAM,YAAY,GAAG,cAAc,CAAC,EAAE,CAAC;YAEvC,uCAAuC;YACvC,MAAM,YAAY,GAAG,6CAA6C,SAAS,aAAa,YAAY,YAAY,CAAC;YACjH,MAAM,iBAAiB,GAAG,MAAM,KAAK,CAAC,YAAY,EAAE;gBAClD,OAAO,EAAE;oBACP,aAAa,EAAE,UAAU,eAAe,EAAE;iBAC3C;aACF,CAAC,CAAC;YAEH,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,0CAA0C,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC;YACxF,CAAC;YAED,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAC;YACrD,MAAM,SAAS,GAAmB,aAAa,CAAC,SAAS,IAAI,EAAE,CAAC;YAEhE,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3B,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,uEAAuE;YACvE,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;YACxE,MAAM,QAAQ,GAAG,aAAa,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;YAE/C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,uCAAuC;YACvC,MAAM,YAAY,GAAG,6CAA6C,SAAS,aAAa,YAAY,YAAY,CAAC;YACjH,MAAM,iBAAiB,GAAG,MAAM,KAAK,CAAC,YAAY,EAAE;gBAClD,OAAO,EAAE;oBACP,aAAa,EAAE,UAAU,eAAe,EAAE;iBAC3C;aACF,CAAC,CAAC;YAEH,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,0CAA0C,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC;YACxF,CAAC;YAED,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAC;YACrD,MAAM,SAAS,GAAmB,aAAa,CAAC,SAAS,IAAI,EAAE,CAAC;YAEhE,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3B,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,mDAAmD;YACnD,MAAM,cAAc,GAAG,OAAO,EAAE,YAAY;gBAC1C,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,YAAY,CAAC;gBAC1D,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAEjB,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CACb,8BAA8B,OAAO,EAAE,YAAY,wBAAwB,CAC5E,CAAC;YACJ,CAAC;YAED,2CAA2C;YAC3C,MAAM,cAAc,GAAG,OAAO,EAAE,QAAQ,IAAI,cAAc,CAAC,UAAU,CAAC;YACtE,MAAM,eAAe,GAAG,6CAA6C,SAAS,aAAa,YAAY,UAAU,cAAc,kBAAkB,CAAC;YAClJ,MAAM,oBAAoB,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE;gBACxD,OAAO,EAAE;oBACP,aAAa,EAAE,UAAU,eAAe,EAAE;iBAC3C;aACF,CAAC,CAAC;YAEH,IAAI,CAAC,oBAAoB,CAAC,EAAE,EAAE,CAAC;gBAC7B,MAAM,IAAI,KAAK,CACb,uCAAuC,oBAAoB,CAAC,MAAM,yBAAyB,cAAc,8BAA8B,CACxI,CAAC;YACJ,CAAC;YAED,MAAM,gBAAgB,GAAa,MAAM,oBAAoB,CAAC,IAAI,EAAE,CAAC;YACrE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC;YAE3C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CACb,gDAAgD,cAAc,0CAA0C,CACzG,CAAC;YACJ,CAAC;YAED,qEAAqE;YACrE,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC;YAC9B,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;YAE/D,MAAM,cAAc,GAAG,uBAAuB,CAAC;gBAC7C,IAAI,EAAE,cAAc;gBACpB,QAAQ;gBACR,QAAQ,EAAE,cAAc,CAAC,IAAI;gBAC7B,IAAI,EAAE,OAAO;gBACb,UAAU;aACX,CAAC,CAAC;YAEH,wBAAwB;YACxB,MAAM,UAAU,GAAa,EAAE,CAAC;YAEhC,KAAK,MAAM,UAAU,IAAI,aAAa,EAAE,CAAC;gBACvC,MAAM,WAAW,GAAG,GAAG,YAAY,GAAG,UAAU,EAAE,CAAC;gBACnD,IAAI,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC/B,UAAU,CAAC,IAAI,CAAC;wBACd,IAAI,EAAE,WAAW;wBACjB,KAAK,EAAE,cAAc,CAAC,UAAU,CAAC;qBAClC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,OAAO,UAAU,CAAC;QACpB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,mDAAmD,EAAE,KAAK,CAAC,CAAC;YAC1E,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,EAAE,0BAA0B;QAChC,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"}
|
|
@@ -3,6 +3,7 @@ export type SyncEnvVarsBody = Record<string, string> | Array<{
|
|
|
3
3
|
name: string;
|
|
4
4
|
value: string;
|
|
5
5
|
isParentEnv?: boolean;
|
|
6
|
+
isSecret?: boolean;
|
|
6
7
|
}>;
|
|
7
8
|
export type SyncEnvVarsResult = SyncEnvVarsBody | Promise<void | undefined | SyncEnvVarsBody> | void | undefined;
|
|
8
9
|
export type SyncEnvVarsParams = {
|
|
@@ -62,7 +62,14 @@ export function syncEnvVars(fn, options) {
|
|
|
62
62
|
}
|
|
63
63
|
const env = stripUnsyncableEnvVars(result.env);
|
|
64
64
|
const parentEnv = result.parentEnv ? stripUnsyncableEnvVars(result.parentEnv) : undefined;
|
|
65
|
-
const
|
|
65
|
+
const secretEnv = result.secretEnv ? stripUnsyncableEnvVars(result.secretEnv) : undefined;
|
|
66
|
+
const secretParentEnv = result.secretParentEnv
|
|
67
|
+
? stripUnsyncableEnvVars(result.secretParentEnv)
|
|
68
|
+
: undefined;
|
|
69
|
+
const numberOfEnvVars = Object.keys(env).length +
|
|
70
|
+
(parentEnv ? Object.keys(parentEnv).length : 0) +
|
|
71
|
+
(secretEnv ? Object.keys(secretEnv).length : 0) +
|
|
72
|
+
(secretParentEnv ? Object.keys(secretParentEnv).length : 0);
|
|
66
73
|
if (numberOfEnvVars === 0) {
|
|
67
74
|
$spinner.stop("No env vars detected");
|
|
68
75
|
return;
|
|
@@ -78,6 +85,8 @@ export function syncEnvVars(fn, options) {
|
|
|
78
85
|
deploy: {
|
|
79
86
|
env,
|
|
80
87
|
parentEnv,
|
|
88
|
+
secretEnv,
|
|
89
|
+
secretParentEnv,
|
|
81
90
|
override: options?.override ?? true,
|
|
82
91
|
},
|
|
83
92
|
});
|
|
@@ -126,10 +135,18 @@ async function callSyncEnvVarsFn(syncEnvVarsFn, env, environment, branch, contex
|
|
|
126
135
|
typeof item.name === "string" &&
|
|
127
136
|
typeof item.value === "string") {
|
|
128
137
|
if (item.isParentEnv) {
|
|
129
|
-
if (
|
|
130
|
-
resolvedEnvVars.
|
|
138
|
+
if (item.isSecret) {
|
|
139
|
+
resolvedEnvVars.secretParentEnv ??= {};
|
|
140
|
+
resolvedEnvVars.secretParentEnv[item.name] = item.value;
|
|
131
141
|
}
|
|
132
|
-
|
|
142
|
+
else {
|
|
143
|
+
resolvedEnvVars.parentEnv ??= {};
|
|
144
|
+
resolvedEnvVars.parentEnv[item.name] = item.value;
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
else if (item.isSecret) {
|
|
148
|
+
resolvedEnvVars.secretEnv ??= {};
|
|
149
|
+
resolvedEnvVars.secretEnv[item.name] = item.value;
|
|
133
150
|
}
|
|
134
151
|
else {
|
|
135
152
|
resolvedEnvVars.env[item.name] = item.value;
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
1
|
+
{"version":3,"file":"syncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/syncEnvVars.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { syncEnvVars } from "./syncEnvVars.js";
|
|
3
|
+
async function runExtension(fn) {
|
|
4
|
+
let captured;
|
|
5
|
+
const context = {
|
|
6
|
+
target: "deploy",
|
|
7
|
+
config: { project: "proj_test" },
|
|
8
|
+
logger: {
|
|
9
|
+
spinner: () => ({ stop: () => { } }),
|
|
10
|
+
},
|
|
11
|
+
addLayer: (layer) => {
|
|
12
|
+
captured = layer;
|
|
13
|
+
},
|
|
14
|
+
};
|
|
15
|
+
const manifest = {
|
|
16
|
+
deploy: { env: {} },
|
|
17
|
+
environment: "prod",
|
|
18
|
+
branch: undefined,
|
|
19
|
+
};
|
|
20
|
+
const extension = syncEnvVars(fn);
|
|
21
|
+
await extension.onBuildComplete(context, manifest);
|
|
22
|
+
return captured;
|
|
23
|
+
}
|
|
24
|
+
describe("syncEnvVars isSecret", () => {
|
|
25
|
+
it("partitions secret and non-secret vars across child and parent", async () => {
|
|
26
|
+
const layer = await runExtension(() => [
|
|
27
|
+
{ name: "PUBLIC_URL", value: "https://example.com" },
|
|
28
|
+
{ name: "API_KEY", value: "secret-key", isSecret: true },
|
|
29
|
+
{ name: "PARENT_PUBLIC", value: "parent", isParentEnv: true },
|
|
30
|
+
{ name: "PARENT_SECRET", value: "parent-secret", isParentEnv: true, isSecret: true },
|
|
31
|
+
]);
|
|
32
|
+
expect(layer?.deploy?.env).toEqual({ PUBLIC_URL: "https://example.com" });
|
|
33
|
+
expect(layer?.deploy?.secretEnv).toEqual({ API_KEY: "secret-key" });
|
|
34
|
+
expect(layer?.deploy?.parentEnv).toEqual({ PARENT_PUBLIC: "parent" });
|
|
35
|
+
expect(layer?.deploy?.secretParentEnv).toEqual({ PARENT_SECRET: "parent-secret" });
|
|
36
|
+
});
|
|
37
|
+
it("treats the record form as all non-secret", async () => {
|
|
38
|
+
const layer = await runExtension(() => ({ DATABASE_URL: "postgres://..." }));
|
|
39
|
+
expect(layer?.deploy?.env).toEqual({ DATABASE_URL: "postgres://..." });
|
|
40
|
+
expect(layer?.deploy?.secretEnv).toBeUndefined();
|
|
41
|
+
expect(layer?.deploy?.secretParentEnv).toBeUndefined();
|
|
42
|
+
});
|
|
43
|
+
it("omits secret buckets when no var is marked secret", async () => {
|
|
44
|
+
const layer = await runExtension(() => [{ name: "PUBLIC_URL", value: "https://example.com" }]);
|
|
45
|
+
expect(layer?.deploy?.env).toEqual({ PUBLIC_URL: "https://example.com" });
|
|
46
|
+
expect(layer?.deploy?.secretEnv).toBeUndefined();
|
|
47
|
+
expect(layer?.deploy?.secretParentEnv).toBeUndefined();
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
//# sourceMappingURL=syncEnvVars.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"syncEnvVars.test.js","sourceRoot":"","sources":["../../../../src/extensions/core/syncEnvVars.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncSupabaseEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/syncSupabaseEnvVars.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AA6BzC,yDAAyD;AACzD,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,cAAc;IACd,cAAc;IACd,iBAAiB;IACjB,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,YAAY;IACZ,YAAY;IACZ,cAAc;IACd,mBAAmB;IACnB,2BAA2B;IAC3B,qBAAqB;CACtB,CAAC;AAEF,SAAS,2BAA2B,CAAC,OAUpC;IACC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IAElG,MAAM,gBAAgB,GAAG,gBAAgB,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,QAAQ,kBAAkB,CAAC;IAEhJ,MAAM,QAAQ,GAA2B;QACvC,YAAY,EAAE,gBAAgB;QAC9B,YAAY,EAAE,gBAAgB;QAC9B,eAAe,EAAE,gBAAgB;QACjC,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC;QACpB,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,QAAQ;QACpB,UAAU,EAAE,QAAQ;QACpB,YAAY,EAAE,WAAW,GAAG,cAAc;QAC1C,mBAAmB,EAAE,SAAS;KAC/B,CAAC;IAEF,IAAI,OAAO,EAAE,CAAC;QACZ,QAAQ,CAAC,iBAAiB,GAAG,OAAO,CAAC;IACvC,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,QAAQ,CAAC,yBAAyB,GAAG,cAAc,CAAC;IACtD,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,OASnC;IACC,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACrC,oCAAoC;QACpC,IAAI,GAAG,CAAC,WAAW,KAAK,KAAK,EAAE,CAAC;YAC9B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,SAAS,GACb,OAAO,EAAE,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC;QACvF,MAAM,mBAAmB,GACvB,OAAO,EAAE,mBAAmB;YAC5B,OAAO,CAAC,GAAG,CAAC,qBAAqB;YACjC,GAAG,CAAC,GAAG,CAAC,qBAAqB,CAAC;QAChC,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC;QAC7C,MAAM,YAAY,GAAG,OAAO,EAAE,YAAY,IAAI,EAAE,CAAC;QACjD,MAAM,aAAa,GAAG,iBAAiB,CAAC;QAExC,iDAAiD;QACjD,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,8FAA8F,CAC/F,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CACb,0GAA0G,CAC3G,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAAG;YACd,aAAa,EAAE,UAAU,mBAAmB,EAAE;SAC/C,CAAC;QAEF,wBAAwB;QACxB,MAAM,WAAW,GAAG,wCAAwC,SAAS,WAAW,CAAC;QACjF,MAAM,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,GAAG,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"syncSupabaseEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/syncSupabaseEnvVars.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export function syncVercelEnvVars(options) {
|
|
|
11
11
|
process.env.VERCEL_PREVIEW_BRANCH ??
|
|
12
12
|
ctx.env.VERCEL_PREVIEW_BRANCH ??
|
|
13
13
|
ctx.branch;
|
|
14
|
-
const isVercelEnv = !!
|
|
14
|
+
const isVercelEnv = !!ctx.env.VERCEL;
|
|
15
15
|
if (!projectId) {
|
|
16
16
|
throw new Error("syncVercelEnvVars: you did not pass in a projectId or set the VERCEL_PROJECT_ID env var.");
|
|
17
17
|
}
|
|
@@ -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;AAYzC,MAAM,UAAU,iBAAiB,CAAC,OASjC;IACC,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACrC,MAAM,SAAS,GACb,OAAO,EAAE,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC;QACnF,MAAM,iBAAiB,GACrB,OAAO,EAAE,iBAAiB;YAC1B,OAAO,CAAC,GAAG,CAAC,mBAAmB;YAC/B,GAAG,CAAC,GAAG,CAAC,mBAAmB;YAC3B,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;QAC3B,MAAM,YAAY,GAChB,OAAO,EAAE,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;QAChF,MAAM,MAAM,GACV,OAAO,EAAE,MAAM;YACf,OAAO,CAAC,GAAG,CAAC,qBAAqB;YACjC,GAAG,CAAC,GAAG,CAAC,qBAAqB;YAC7B,GAAG,CAAC,MAAM,CAAC;QACb,MAAM,WAAW,GAAG,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"vercelSyncEnvVars.js","sourceRoot":"","sources":["../../../../src/extensions/core/vercelSyncEnvVars.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import { createRequire } from "node:module";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
const compilerPackages = ["typescript", "@typescript/typescript6"];
|
|
4
|
+
function hasTranspileModule(value) {
|
|
5
|
+
return (typeof value === "object" &&
|
|
6
|
+
value !== null &&
|
|
7
|
+
"transpileModule" in value &&
|
|
8
|
+
typeof value.transpileModule === "function");
|
|
9
|
+
}
|
|
10
|
+
function isUnavailablePackage(error) {
|
|
11
|
+
return (error instanceof Error &&
|
|
12
|
+
"code" in error &&
|
|
13
|
+
(error.code === "MODULE_NOT_FOUND" || error.code === "ERR_PACKAGE_PATH_NOT_EXPORTED"));
|
|
14
|
+
}
|
|
15
|
+
export function loadTypescript(projectDir, packageNames = compilerPackages) {
|
|
16
|
+
const requireFromProject = createRequire(join(projectDir, "package.json"));
|
|
17
|
+
const loadErrors = [];
|
|
18
|
+
for (const packageName of packageNames) {
|
|
19
|
+
let resolvedPackage;
|
|
20
|
+
try {
|
|
21
|
+
resolvedPackage = requireFromProject.resolve(packageName);
|
|
22
|
+
}
|
|
23
|
+
catch (error) {
|
|
24
|
+
if (isUnavailablePackage(error)) {
|
|
25
|
+
continue;
|
|
26
|
+
}
|
|
27
|
+
throw error;
|
|
28
|
+
}
|
|
29
|
+
let compiler;
|
|
30
|
+
try {
|
|
31
|
+
compiler = requireFromProject(resolvedPackage);
|
|
32
|
+
}
|
|
33
|
+
catch (error) {
|
|
34
|
+
loadErrors.push(new Error(`Failed to load "${packageName}" from ${projectDir}.`, { cause: error }));
|
|
35
|
+
continue;
|
|
36
|
+
}
|
|
37
|
+
if (hasTranspileModule(compiler)) {
|
|
38
|
+
return compiler;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
if (loadErrors.length === 1) {
|
|
42
|
+
throw loadErrors[0];
|
|
43
|
+
}
|
|
44
|
+
if (loadErrors.length > 1) {
|
|
45
|
+
throw new AggregateError(loadErrors, `Failed to load a compatible TypeScript compiler from ${projectDir}.`);
|
|
46
|
+
}
|
|
47
|
+
throw new Error([
|
|
48
|
+
"The emitDecoratorMetadata() build extension requires the TypeScript JavaScript compiler API,",
|
|
49
|
+
"which TypeScript 7 does not expose.",
|
|
50
|
+
"",
|
|
51
|
+
"Install the TypeScript 6 compatibility package alongside TypeScript 7:",
|
|
52
|
+
"",
|
|
53
|
+
" npm install --save-dev @typescript/typescript6",
|
|
54
|
+
"",
|
|
55
|
+
"Restart the Trigger.dev dev server after installing the package.",
|
|
56
|
+
"See https://trigger.dev/docs/config/extensions/emitDecoratorMetadata#using-with-typescript-7",
|
|
57
|
+
].join("\n"));
|
|
58
|
+
}
|
|
59
|
+
//# sourceMappingURL=loadTypescript.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loadTypescript.js","sourceRoot":"","sources":["../../../../src/extensions/internal/loadTypescript.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAIjC,MAAM,gBAAgB,GAAG,CAAC,YAAY,EAAE,yBAAyB,CAAU,CAAC;AAE5E,SAAS,kBAAkB,CAAC,KAAc;IACxC,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,iBAAiB,IAAI,KAAK;QAC1B,OAAO,KAAK,CAAC,eAAe,KAAK,UAAU,CAC5C,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc;IAC1C,OAAO,CACL,KAAK,YAAY,KAAK;QACtB,MAAM,IAAI,KAAK;QACf,CAAC,KAAK,CAAC,IAAI,KAAK,kBAAkB,IAAI,KAAK,CAAC,IAAI,KAAK,+BAA+B,CAAC,CACtF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,UAAkB,EAClB,eAAkC,gBAAgB;IAElD,MAAM,kBAAkB,GAAG,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;IAC3E,MAAM,UAAU,GAAY,EAAE,CAAC;IAE/B,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACvC,IAAI,eAAuB,CAAC;QAE5B,IAAI,CAAC;YACH,eAAe,GAAG,kBAAkB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC5D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChC,SAAS;YACX,CAAC;YAED,MAAM,KAAK,CAAC;QACd,CAAC;QAED,IAAI,QAAiB,CAAC;QAEtB,IAAI,CAAC;YACH,QAAQ,GAAG,kBAAkB,CAAC,eAAe,CAAC,CAAC;QACjD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,IAAI,CACb,IAAI,KAAK,CAAC,mBAAmB,WAAW,UAAU,UAAU,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CACnF,CAAC;YACF,SAAS;QACX,CAAC;QAED,IAAI,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjC,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,UAAU,CAAC,CAAC,CAAC,CAAC;IACtB,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,cAAc,CACtB,UAAU,EACV,wDAAwD,UAAU,GAAG,CACtE,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,KAAK,CACb;QACE,8FAA8F;QAC9F,qCAAqC;QACrC,EAAE;QACF,wEAAwE;QACxE,EAAE;QACF,kDAAkD;QAClD,EAAE;QACF,kEAAkE;QAClE,8FAA8F;KAC/F,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
import { createRequire } from "node:module";
|
|
2
|
+
import { mkdtempSync, mkdirSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
|
|
3
|
+
import { tmpdir } from "node:os";
|
|
4
|
+
import { dirname, join } from "node:path";
|
|
5
|
+
import { afterEach, describe, expect, it } from "vitest";
|
|
6
|
+
import { loadTypescript } from "./loadTypescript.js";
|
|
7
|
+
const packageRequire = createRequire(join(process.cwd(), "package.json"));
|
|
8
|
+
const projectDirs = new Set();
|
|
9
|
+
function createProject(packages) {
|
|
10
|
+
const projectDir = mkdtempSync(join(tmpdir(), "trigger-typescript-"));
|
|
11
|
+
projectDirs.add(projectDir);
|
|
12
|
+
const nodeModulesDir = join(projectDir, "node_modules");
|
|
13
|
+
mkdirSync(nodeModulesDir);
|
|
14
|
+
writeFileSync(join(projectDir, "package.json"), JSON.stringify({ private: true }));
|
|
15
|
+
for (const [installedName, sourceName] of Object.entries(packages)) {
|
|
16
|
+
const target = dirname(packageRequire.resolve(`${sourceName}/package.json`));
|
|
17
|
+
const destination = join(nodeModulesDir, installedName);
|
|
18
|
+
mkdirSync(dirname(destination), { recursive: true });
|
|
19
|
+
symlinkSync(target, destination, "junction");
|
|
20
|
+
}
|
|
21
|
+
return projectDir;
|
|
22
|
+
}
|
|
23
|
+
function createBrokenCompiler(projectDir, packageName = "typescript") {
|
|
24
|
+
const packageDir = join(projectDir, "node_modules", packageName);
|
|
25
|
+
mkdirSync(packageDir, { recursive: true });
|
|
26
|
+
writeFileSync(join(packageDir, "package.json"), JSON.stringify({ name: packageName, main: "index.cjs" }));
|
|
27
|
+
writeFileSync(join(packageDir, "index.cjs"), 'throw new Error("broken compiler");');
|
|
28
|
+
}
|
|
29
|
+
describe("loadTypescript", () => {
|
|
30
|
+
afterEach(() => {
|
|
31
|
+
for (const projectDir of projectDirs) {
|
|
32
|
+
rmSync(projectDir, { recursive: true, force: true });
|
|
33
|
+
}
|
|
34
|
+
projectDirs.clear();
|
|
35
|
+
});
|
|
36
|
+
it("loads the consumer's TypeScript 5 compiler", () => {
|
|
37
|
+
const compiler = loadTypescript(createProject({ typescript: "typescript5" }));
|
|
38
|
+
expect(compiler.version).toMatch(/^5\./);
|
|
39
|
+
expect(typeof compiler.transpileModule).toBe("function");
|
|
40
|
+
});
|
|
41
|
+
it("loads the consumer's TypeScript 6 compiler", () => {
|
|
42
|
+
const compiler = loadTypescript(createProject({ typescript: "typescript" }));
|
|
43
|
+
expect(compiler.version).toMatch(/^6\./);
|
|
44
|
+
expect(typeof compiler.transpileModule).toBe("function");
|
|
45
|
+
});
|
|
46
|
+
it("returns an actionable error for TypeScript 7 without the compatibility package", () => {
|
|
47
|
+
const projectDir = createProject({ typescript: "typescript7" });
|
|
48
|
+
const requireFromProject = createRequire(join(projectDir, "package.json"));
|
|
49
|
+
expect(typeof requireFromProject("typescript").transpileModule).toBe("undefined");
|
|
50
|
+
expect(() => loadTypescript(projectDir, ["typescript"])).toThrowError(expect.objectContaining({
|
|
51
|
+
message: expect.stringContaining("npm install --save-dev @typescript/typescript6"),
|
|
52
|
+
}));
|
|
53
|
+
});
|
|
54
|
+
it("surfaces errors from an installed compiler package", () => {
|
|
55
|
+
const projectDir = createProject({});
|
|
56
|
+
createBrokenCompiler(projectDir);
|
|
57
|
+
expect(() => loadTypescript(projectDir, ["typescript"])).toThrowError(`Failed to load "typescript" from ${projectDir}.`);
|
|
58
|
+
});
|
|
59
|
+
it("falls back when an earlier compiler package fails to load", () => {
|
|
60
|
+
const projectDir = createProject({
|
|
61
|
+
"@typescript/typescript6": "@typescript/typescript6",
|
|
62
|
+
});
|
|
63
|
+
createBrokenCompiler(projectDir);
|
|
64
|
+
const compiler = loadTypescript(projectDir);
|
|
65
|
+
expect(compiler.version).toMatch(/^6\./);
|
|
66
|
+
expect(typeof compiler.transpileModule).toBe("function");
|
|
67
|
+
});
|
|
68
|
+
it("falls back to the TypeScript 6 compatibility package for TypeScript 7", () => {
|
|
69
|
+
const compiler = loadTypescript(createProject({
|
|
70
|
+
typescript: "typescript7",
|
|
71
|
+
"@typescript/typescript6": "@typescript/typescript6",
|
|
72
|
+
}));
|
|
73
|
+
const output = compiler.transpileModule(`
|
|
74
|
+
class Dependency {}
|
|
75
|
+
function injectable<T extends new (...args: any[]) => object>(target: T) {}
|
|
76
|
+
|
|
77
|
+
@injectable
|
|
78
|
+
class Service {
|
|
79
|
+
constructor(public dependency: Dependency) {}
|
|
80
|
+
}
|
|
81
|
+
`, {
|
|
82
|
+
compilerOptions: {
|
|
83
|
+
experimentalDecorators: true,
|
|
84
|
+
emitDecoratorMetadata: true,
|
|
85
|
+
},
|
|
86
|
+
}).outputText;
|
|
87
|
+
expect(compiler.version).toMatch(/^6\./);
|
|
88
|
+
expect(output).toContain('__metadata("design:paramtypes", [Dependency])');
|
|
89
|
+
});
|
|
90
|
+
it("supports aliasing TypeScript to the compatibility package", () => {
|
|
91
|
+
const compiler = loadTypescript(createProject({ typescript: "@typescript/typescript6" }));
|
|
92
|
+
expect(compiler.version).toMatch(/^6\./);
|
|
93
|
+
expect(typeof compiler.transpileModule).toBe("function");
|
|
94
|
+
});
|
|
95
|
+
});
|
|
96
|
+
//# sourceMappingURL=loadTypescript.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loadTypescript.test.js","sourceRoot":"","sources":["../../../../src/extensions/internal/loadTypescript.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,28 +1,30 @@
|
|
|
1
1
|
import { readFile } from "node:fs/promises";
|
|
2
|
-
import
|
|
3
|
-
|
|
2
|
+
import { dirname } from "node:path";
|
|
3
|
+
import { loadTypescript } from "./internal/loadTypescript.js";
|
|
4
4
|
const decoratorMatcher = new RegExp(/((?<![(\s]\s*['"])@\w[.[\]\w\d]*\s*(?![;])[((?=\s)])/);
|
|
5
5
|
export function emitDecoratorMetadata() {
|
|
6
6
|
return {
|
|
7
7
|
name: "emitDecoratorMetadata",
|
|
8
8
|
onBuildStart(context) {
|
|
9
|
+
const { convertCompilerOptionsFromJson, transpileModule, ModuleKind } = loadTypescript(context.workingDir);
|
|
9
10
|
context.registerPlugin({
|
|
10
11
|
name: "emitDecoratorMetadata",
|
|
11
12
|
async setup(build) {
|
|
12
|
-
const {
|
|
13
|
+
const { parse, TSConfckCache } = await import("tsconfck");
|
|
13
14
|
const cache = new TSConfckCache();
|
|
14
15
|
build.onLoad({ filter: /\.ts$/ }, async (args) => {
|
|
15
16
|
context.logger.debug("emitDecoratorMetadata onLoad", { args });
|
|
16
|
-
const { tsconfigFile, tsconfig } = await
|
|
17
|
+
const { tsconfigFile, tsconfig } = await parse(args.path, {
|
|
17
18
|
ignoreNodeModules: true,
|
|
18
19
|
cache,
|
|
19
20
|
});
|
|
20
|
-
|
|
21
|
+
const { options: compilerOptions } = convertCompilerOptionsFromJson(tsconfig.compilerOptions ?? {}, tsconfigFile ? dirname(tsconfigFile) : context.workingDir);
|
|
22
|
+
context.logger.debug("emitDecoratorMetadata parsed tsconfig", {
|
|
21
23
|
tsconfig,
|
|
22
24
|
tsconfigFile,
|
|
23
25
|
args,
|
|
24
26
|
});
|
|
25
|
-
if (
|
|
27
|
+
if (compilerOptions.emitDecoratorMetadata !== true) {
|
|
26
28
|
context.logger.debug("emitDecoratorMetadata skipping", {
|
|
27
29
|
args,
|
|
28
30
|
tsconfig,
|
|
@@ -42,7 +44,7 @@ export function emitDecoratorMetadata() {
|
|
|
42
44
|
const program = transpileModule(ts, {
|
|
43
45
|
fileName: args.path,
|
|
44
46
|
compilerOptions: {
|
|
45
|
-
...
|
|
47
|
+
...compilerOptions,
|
|
46
48
|
module: ModuleKind.ES2022,
|
|
47
49
|
},
|
|
48
50
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../src/extensions/typescript.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,
|
|
1
|
+
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../src/extensions/typescript.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,MAAM,gBAAgB,GAAG,IAAI,MAAM,CAAC,sDAAsD,CAAC,CAAC;AAE5F,MAAM,UAAU,qBAAqB;IACnC,OAAO;QACL,IAAI,EAAE,uBAAuB;QAC7B,YAAY,CAAC,OAAO;YAClB,MAAM,EAAE,8BAA8B,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,cAAc,CACpF,OAAO,CAAC,UAAU,CACnB,CAAC;YAEF,OAAO,CAAC,cAAc,CAAC;gBACrB,IAAI,EAAE,uBAAuB;gBAC7B,KAAK,CAAC,KAAK,CAAC,KAAK;oBACf,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;oBAC1D,MAAM,KAAK,GAAG,IAAI,aAAa,EAAO,CAAC;oBAEvC,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;wBAC/C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;wBAE/D,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE;4BACxD,iBAAiB,EAAE,IAAI;4BACvB,KAAK;yBACN,CAAC,CAAC;wBACH,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,8BAA8B,CACjE,QAAQ,CAAC,eAAe,IAAI,EAAE,EAC9B,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAC1D,CAAC;wBAEF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,EAAE;4BAC5D,QAAQ;4BACR,YAAY;4BACZ,IAAI;yBACL,CAAC,CAAC;wBAEH,IAAI,eAAe,CAAC,qBAAqB,KAAK,IAAI,EAAE,CAAC;4BACnD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE;gCACrD,IAAI;gCACJ,QAAQ;6BACT,CAAC,CAAC;4BAEH,OAAO,SAAS,CAAC;wBACnB,CAAC;wBAED,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;wBAE7C,IAAI,CAAC,EAAE;4BAAE,OAAO,SAAS,CAAC;wBAE1B,wDAAwD;wBACxD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;4BAC/B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,qDAAqD,EAAE;gCAC1E,IAAI;6BACL,CAAC,CAAC;4BAEH,OAAO,SAAS,CAAC;wBACnB,CAAC;wBAED,MAAM,OAAO,GAAG,eAAe,CAAC,EAAE,EAAE;4BAClC,QAAQ,EAAE,IAAI,CAAC,IAAI;4BACnB,eAAe,EAAE;gCACf,GAAG,eAAe;gCAClB,MAAM,EAAE,UAAU,CAAC,MAAM;6BAC1B;yBACF,CAAC,CAAC;wBAEH,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC;oBAC1C,CAAC,CAAC,CAAC;gBACL,CAAC;aACF,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}
|