@gadicc/loom 1.37.0 → 1.38.0
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/README.md +10 -0
- package/esm/src/cli/localDb.js +2 -2
- package/esm/src/cli/migrationEnv.js +2 -2
- package/esm/src/cli/mod.d.ts +1 -0
- package/esm/src/cli/mod.d.ts.map +1 -1
- package/esm/src/cli/mod.js +164 -4
- package/esm/src/cli/vercelBuildEnv.d.ts.map +1 -1
- package/esm/src/cli/vercelBuildEnv.js +23 -6
- package/esm/src/cli/vercelEnvMask.d.ts +38 -0
- package/esm/src/cli/vercelEnvMask.d.ts.map +1 -0
- package/esm/src/cli/vercelEnvMask.js +136 -0
- package/esm/src/cli/vercelProjectRelease.js +2 -2
- package/esm/src/cli/vercelPulledEnv.d.ts +65 -0
- package/esm/src/cli/vercelPulledEnv.d.ts.map +1 -0
- package/esm/src/cli/vercelPulledEnv.js +132 -0
- package/package.json +2 -2
- package/script/src/cli/localDb.js +2 -2
- package/script/src/cli/migrationEnv.js +2 -2
- package/script/src/cli/mod.d.ts +1 -0
- package/script/src/cli/mod.d.ts.map +1 -1
- package/script/src/cli/mod.js +164 -4
- package/script/src/cli/vercelBuildEnv.d.ts.map +1 -1
- package/script/src/cli/vercelBuildEnv.js +23 -6
- package/script/src/cli/vercelEnvMask.d.ts +38 -0
- package/script/src/cli/vercelEnvMask.d.ts.map +1 -0
- package/script/src/cli/vercelEnvMask.js +142 -0
- package/script/src/cli/vercelProjectRelease.js +2 -2
- package/script/src/cli/vercelPulledEnv.d.ts +65 -0
- package/script/src/cli/vercelPulledEnv.d.ts.map +1 -0
- package/script/src/cli/vercelPulledEnv.js +138 -0
- package/skills/loom/references/dependency-upgrades.md +4 -0
- package/skills/loom/references/release-safety.md +10 -3
- package/skills/loom-auth/references/secrets-and-rotation.md +2 -1
- package/skills/loom-scaffold/references/greenfield-workflow.md +2 -1
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
/** One assignment read from a dotenv file, in file order. */
|
|
2
|
+
export type PulledEnvEntry = {
|
|
3
|
+
/**
|
|
4
|
+
* The on-disk text up to the last `"` on the line, when a dotenv-style early
|
|
5
|
+
* close (see {@link parsePulledEnv}) ended {@link raw} sooner. A Vercel value
|
|
6
|
+
* can itself contain `" #`, so masking registers this form too.
|
|
7
|
+
*/
|
|
8
|
+
alternateRaw?: string;
|
|
9
|
+
/** 1-based line on which the assignment ends (later for multi-line). */
|
|
10
|
+
endLine: number;
|
|
11
|
+
key: string;
|
|
12
|
+
/** 1-based line on which the assignment starts. */
|
|
13
|
+
line: number;
|
|
14
|
+
/**
|
|
15
|
+
* The value as written on disk between its quotes (or the trimmed unquoted
|
|
16
|
+
* text), before `\n`/`\r` escapes are decoded.
|
|
17
|
+
*/
|
|
18
|
+
raw: string;
|
|
19
|
+
/** The decoded value (see {@link parsePulledEnv} for how it is chosen). */
|
|
20
|
+
value: string;
|
|
21
|
+
};
|
|
22
|
+
/** A parsed dotenv file. */
|
|
23
|
+
export type PulledEnvFile = {
|
|
24
|
+
entries: PulledEnvEntry[];
|
|
25
|
+
/** 1-based lines that are neither blank, a comment, nor an assignment. */
|
|
26
|
+
unrecognizedLines: number[];
|
|
27
|
+
/** Final value per key; a later assignment wins, as in dotenv. */
|
|
28
|
+
values: Record<string, string>;
|
|
29
|
+
};
|
|
30
|
+
/** Decodes the `\n` and `\r` escapes `vercel pull` writes in quoted values. */
|
|
31
|
+
export declare function decodePulledEnvEscapes(raw: string): string;
|
|
32
|
+
/**
|
|
33
|
+
* Parses dotenv text so that masking and placeholder checks see the value
|
|
34
|
+
* Vercel stored.
|
|
35
|
+
*
|
|
36
|
+
* `vercel pull` writes every variable as `KEY="<value>"`, escaping only newline
|
|
37
|
+
* and carriage return (as `\n` and `\r`) and writing `"`, `\`, `#`, `$`, U+2028
|
|
38
|
+
* and U+2029 as they are. No consumer reads that format back exactly:
|
|
39
|
+
*
|
|
40
|
+
* - Node's `util.parseEnv` ends the value at its first embedded `"`, so
|
|
41
|
+
* `KEY="{"a":1}"` reads as `{`.
|
|
42
|
+
* - `vercel build` loads the file with its bundled dotenv 4.0.0, which trims
|
|
43
|
+
* inside the quotes, decodes `\n` but not `\r`, does not treat `#` specially,
|
|
44
|
+
* and drops any line containing U+2028 or U+2029.
|
|
45
|
+
* - Next.js (`@next/env`) uses dotenv 16, which cuts a value containing both
|
|
46
|
+
* `"` and `#` (`KEY="a"b#c"` reads as `"a"b`), and then expands `$VAR`.
|
|
47
|
+
*
|
|
48
|
+
* This reader is deliberately closer to the stored value than any of them,
|
|
49
|
+
* because masking has to cover the secret itself: a double-quoted value that
|
|
50
|
+
* closes on its line runs to the last `"` (or an earlier `"` followed only by a
|
|
51
|
+
* comment, see {@link PulledEnvEntry.alternateRaw}), nothing is trimmed inside
|
|
52
|
+
* the quotes, `#` and `$` are literal, and only `\n` and `\r` are decoded.
|
|
53
|
+
* Everything else follows dotenv 16: unquoted values end at `#` and are
|
|
54
|
+
* trimmed, single- and backtick-quoted values are literal, and quoted values
|
|
55
|
+
* may span lines.
|
|
56
|
+
*/
|
|
57
|
+
export declare function parsePulledEnv(source: string): PulledEnvFile;
|
|
58
|
+
/** Decodes UTF-8, throwing on invalid bytes instead of replacing them. */
|
|
59
|
+
export declare function decodePulledEnvBytes(bytes: Uint8Array): any;
|
|
60
|
+
/**
|
|
61
|
+
* Reads and parses a dotenv file with {@link parsePulledEnv}. Throws on bytes
|
|
62
|
+
* that are not UTF-8 rather than silently replacing them.
|
|
63
|
+
*/
|
|
64
|
+
export declare function readPulledEnvFile(path: string): PulledEnvFile;
|
|
65
|
+
//# sourceMappingURL=vercelPulledEnv.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vercelPulledEnv.d.ts","sourceRoot":"","sources":["../../../src/src/cli/vercelPulledEnv.ts"],"names":[],"mappings":"AAEA,6DAA6D;AAC7D,MAAM,MAAM,cAAc,GAAG;IAC3B;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wEAAwE;IACxE,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,mDAAmD;IACnD,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ,2EAA2E;IAC3E,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,4BAA4B;AAC5B,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,0EAA0E;IAC1E,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,kEAAkE;IAClE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC,CAAC;AAMF,+EAA+E;AAC/E,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,UAEjD;AAqBD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CA0E5D;AAED,0EAA0E;AAC1E,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,UAAU,OAErD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAE7D"}
|
|
@@ -0,0 +1,132 @@
|
|
|
1
|
+
import { readFileSync } from "node:fs";
|
|
2
|
+
// `[\s\S]` rather than `.`: Vercel writes U+2028 and U+2029 unescaped, and `.`
|
|
3
|
+
// would stop at them and reject the whole line.
|
|
4
|
+
const ASSIGNMENT = /^\s*(?:export\s+)?([\w.-]+)(?:\s*=|:\s)\s*([\s\S]*)$/;
|
|
5
|
+
/** Decodes the `\n` and `\r` escapes `vercel pull` writes in quoted values. */
|
|
6
|
+
export function decodePulledEnvEscapes(raw) {
|
|
7
|
+
return raw.replaceAll("\\n", "\n").replaceAll("\\r", "\r");
|
|
8
|
+
}
|
|
9
|
+
function escapeRegExp(text) {
|
|
10
|
+
return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Where a double-quoted value that closes on its own line ends: at the first
|
|
14
|
+
* `"` followed only by whitespace and an optional `# comment` (dotenv's early
|
|
15
|
+
* close, which hand-written files rely on), and otherwise at the last `"`.
|
|
16
|
+
* Vercel never writes comments, so its lines end at the last `"` unless the
|
|
17
|
+
* value itself contains `"` followed by ` #`.
|
|
18
|
+
*/
|
|
19
|
+
function closingQuoteIndex(rest) {
|
|
20
|
+
for (let index = rest.indexOf('"', 1); index > 0;) {
|
|
21
|
+
if (/^\s*(?:#[\s\S]*)?$/.test(rest.slice(index + 1)))
|
|
22
|
+
return index;
|
|
23
|
+
index = rest.indexOf('"', index + 1);
|
|
24
|
+
}
|
|
25
|
+
return -1;
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Parses dotenv text so that masking and placeholder checks see the value
|
|
29
|
+
* Vercel stored.
|
|
30
|
+
*
|
|
31
|
+
* `vercel pull` writes every variable as `KEY="<value>"`, escaping only newline
|
|
32
|
+
* and carriage return (as `\n` and `\r`) and writing `"`, `\`, `#`, `$`, U+2028
|
|
33
|
+
* and U+2029 as they are. No consumer reads that format back exactly:
|
|
34
|
+
*
|
|
35
|
+
* - Node's `util.parseEnv` ends the value at its first embedded `"`, so
|
|
36
|
+
* `KEY="{"a":1}"` reads as `{`.
|
|
37
|
+
* - `vercel build` loads the file with its bundled dotenv 4.0.0, which trims
|
|
38
|
+
* inside the quotes, decodes `\n` but not `\r`, does not treat `#` specially,
|
|
39
|
+
* and drops any line containing U+2028 or U+2029.
|
|
40
|
+
* - Next.js (`@next/env`) uses dotenv 16, which cuts a value containing both
|
|
41
|
+
* `"` and `#` (`KEY="a"b#c"` reads as `"a"b`), and then expands `$VAR`.
|
|
42
|
+
*
|
|
43
|
+
* This reader is deliberately closer to the stored value than any of them,
|
|
44
|
+
* because masking has to cover the secret itself: a double-quoted value that
|
|
45
|
+
* closes on its line runs to the last `"` (or an earlier `"` followed only by a
|
|
46
|
+
* comment, see {@link PulledEnvEntry.alternateRaw}), nothing is trimmed inside
|
|
47
|
+
* the quotes, `#` and `$` are literal, and only `\n` and `\r` are decoded.
|
|
48
|
+
* Everything else follows dotenv 16: unquoted values end at `#` and are
|
|
49
|
+
* trimmed, single- and backtick-quoted values are literal, and quoted values
|
|
50
|
+
* may span lines.
|
|
51
|
+
*/
|
|
52
|
+
export function parsePulledEnv(source) {
|
|
53
|
+
// dotenv normalizes line endings before parsing; Vercel escapes CR and LF
|
|
54
|
+
// inside values, so a real CR here is always part of a line ending.
|
|
55
|
+
const lines = source.replace(/\r\n?/g, "\n").split("\n");
|
|
56
|
+
const entries = [];
|
|
57
|
+
const unrecognizedLines = [];
|
|
58
|
+
for (let index = 0; index < lines.length; index++) {
|
|
59
|
+
const lineText = lines[index];
|
|
60
|
+
const trimmed = lineText.trim();
|
|
61
|
+
if (!trimmed || trimmed.startsWith("#"))
|
|
62
|
+
continue;
|
|
63
|
+
const match = lineText.match(ASSIGNMENT);
|
|
64
|
+
if (!match) {
|
|
65
|
+
unrecognizedLines.push(index + 1);
|
|
66
|
+
continue;
|
|
67
|
+
}
|
|
68
|
+
const [, key, rest] = match;
|
|
69
|
+
const line = index + 1;
|
|
70
|
+
const quote = rest[0];
|
|
71
|
+
const closing = quote === '"' ? closingQuoteIndex(rest) : -1;
|
|
72
|
+
if (closing > 0) {
|
|
73
|
+
const raw = rest.slice(1, closing);
|
|
74
|
+
const last = rest.lastIndexOf('"');
|
|
75
|
+
entries.push({
|
|
76
|
+
...(last > closing ? { alternateRaw: rest.slice(1, last) } : {}),
|
|
77
|
+
endLine: line,
|
|
78
|
+
key,
|
|
79
|
+
line,
|
|
80
|
+
raw,
|
|
81
|
+
value: decodePulledEnvEscapes(raw),
|
|
82
|
+
});
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
if (quote === '"' || quote === "'" || quote === "`") {
|
|
86
|
+
// As in dotenv: the first unescaped closing quote, possibly on a later
|
|
87
|
+
// line, followed only by whitespace or a comment.
|
|
88
|
+
const q = escapeRegExp(quote);
|
|
89
|
+
const remaining = [rest.slice(1), ...lines.slice(index + 1)].join("\n");
|
|
90
|
+
const closed = remaining.match(new RegExp(`^((?:\\\\${q}|[^${q}])*)${q}[ \\t]*(?:#[^\\n]*)?(?:\\n|$)`));
|
|
91
|
+
if (closed) {
|
|
92
|
+
const raw = closed[1];
|
|
93
|
+
index += (closed[0].replace(/\n$/, "").match(/\n/g) ?? []).length;
|
|
94
|
+
entries.push({
|
|
95
|
+
endLine: index + 1,
|
|
96
|
+
key,
|
|
97
|
+
line,
|
|
98
|
+
raw,
|
|
99
|
+
value: quote === '"' ? decodePulledEnvEscapes(raw) : raw,
|
|
100
|
+
});
|
|
101
|
+
continue;
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
// dotenv's unquoted form: up to the first `#`, trimmed, with one pair of
|
|
105
|
+
// matching surrounding quotes removed.
|
|
106
|
+
const text = rest.split("#", 1)[0].trim();
|
|
107
|
+
const surrounding = text.match(/^(['"`])([\s\S]*)\1$/);
|
|
108
|
+
const raw = surrounding ? surrounding[2] : text;
|
|
109
|
+
entries.push({
|
|
110
|
+
endLine: line,
|
|
111
|
+
key,
|
|
112
|
+
line,
|
|
113
|
+
raw,
|
|
114
|
+
value: text.startsWith('"') ? decodePulledEnvEscapes(raw) : raw,
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
const values = {};
|
|
118
|
+
for (const entry of entries)
|
|
119
|
+
values[entry.key] = entry.value;
|
|
120
|
+
return { entries, unrecognizedLines, values };
|
|
121
|
+
}
|
|
122
|
+
/** Decodes UTF-8, throwing on invalid bytes instead of replacing them. */
|
|
123
|
+
export function decodePulledEnvBytes(bytes) {
|
|
124
|
+
return new TextDecoder("utf-8", { fatal: true }).decode(bytes);
|
|
125
|
+
}
|
|
126
|
+
/**
|
|
127
|
+
* Reads and parses a dotenv file with {@link parsePulledEnv}. Throws on bytes
|
|
128
|
+
* that are not UTF-8 rather than silently replacing them.
|
|
129
|
+
*/
|
|
130
|
+
export function readPulledEnvFile(path) {
|
|
131
|
+
return parsePulledEnv(decodePulledEnvBytes(readFileSync(path)));
|
|
132
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gadicc/loom",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.38.0",
|
|
4
4
|
"description": "Deno-first shared helpers for extracting common Next.js app code.",
|
|
5
5
|
"homepage": "https://github.com/gadicc/loom#readme",
|
|
6
6
|
"repository": {
|
|
@@ -280,7 +280,7 @@
|
|
|
280
280
|
},
|
|
281
281
|
"scripts": {},
|
|
282
282
|
"loom": {
|
|
283
|
-
"gitCommit": "
|
|
283
|
+
"gitCommit": "73b85ddced7cbc5b4614ad98b3053455f4629f2a"
|
|
284
284
|
},
|
|
285
285
|
"bin": {
|
|
286
286
|
"loom": "script/bin/loom.js"
|
|
@@ -6,7 +6,7 @@ const node_crypto_1 = require("node:crypto");
|
|
|
6
6
|
const promises_1 = require("node:dns/promises");
|
|
7
7
|
const promises_2 = require("node:fs/promises");
|
|
8
8
|
const node_path_1 = require("node:path");
|
|
9
|
-
const
|
|
9
|
+
const vercelPulledEnv_js_1 = require("./vercelPulledEnv.js");
|
|
10
10
|
const URL_NAMES = [
|
|
11
11
|
"DATABASE_URL",
|
|
12
12
|
"DATABASE_URL_UNPOOLED",
|
|
@@ -133,7 +133,7 @@ async function localFiles(cwd, runner, env) {
|
|
|
133
133
|
throw error;
|
|
134
134
|
}
|
|
135
135
|
const { lines, positions } = assignmentLines(text);
|
|
136
|
-
const values = (0,
|
|
136
|
+
const values = (0, vercelPulledEnv_js_1.parsePulledEnv)(text).values;
|
|
137
137
|
const migrationDir = manifest.features.db.config?.dirs?.drizzleOutDir ??
|
|
138
138
|
"drizzle";
|
|
139
139
|
if (typeof migrationDir !== "string" || migrationDir.startsWith("/") ||
|
|
@@ -41,7 +41,7 @@ exports.loadPostgresDriver = loadPostgresDriver;
|
|
|
41
41
|
exports.verifyMigrationConnection = verifyMigrationConnection;
|
|
42
42
|
exports.verifyMigrationConnectionFromEnvFile = verifyMigrationConnectionFromEnvFile;
|
|
43
43
|
const node_fs_1 = require("node:fs");
|
|
44
|
-
const
|
|
44
|
+
const vercelPulledEnv_js_1 = require("./vercelPulledEnv.js");
|
|
45
45
|
const DEFAULT_MIGRATION_DATABASE_URL_ENV_NAMES = [
|
|
46
46
|
"MIGRATION_DATABASE_URL_UNPOOLED",
|
|
47
47
|
"MIGRATION_DATABASE_URL",
|
|
@@ -96,7 +96,7 @@ function resolveMigrationEnvironmentFromEnvFile(envFile, env) {
|
|
|
96
96
|
return resolveMigrationEnvironment(loadMigrationEnvFile(envFile, env));
|
|
97
97
|
}
|
|
98
98
|
function loadMigrationEnvFile(envFile, env) {
|
|
99
|
-
const pulledEnv = (0,
|
|
99
|
+
const pulledEnv = (0, vercelPulledEnv_js_1.parsePulledEnv)((0, node_fs_1.readFileSync)(envFile, "utf8")).values;
|
|
100
100
|
return { ...pulledEnv, ...env };
|
|
101
101
|
}
|
|
102
102
|
/**
|
package/script/src/cli/mod.d.ts
CHANGED
|
@@ -33,6 +33,7 @@ type PackageJson = {
|
|
|
33
33
|
name?: string;
|
|
34
34
|
dependencies?: Record<string, string>;
|
|
35
35
|
devDependencies?: Record<string, string>;
|
|
36
|
+
engines?: Record<string, unknown>;
|
|
36
37
|
packageManager?: string;
|
|
37
38
|
pnpm?: Record<string, unknown>;
|
|
38
39
|
resolutions?: Record<string, unknown>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../src/src/cli/mod.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../src/src/cli/mod.ts"],"names":[],"mappings":"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"}
|
package/script/src/cli/mod.js
CHANGED
|
@@ -104,6 +104,7 @@ const keyring_js_1 = require("../secrets/keyring.js");
|
|
|
104
104
|
const projectSkills_js_1 = require("./projectSkills.js");
|
|
105
105
|
const migrationEnv_js_1 = require("./migrationEnv.js");
|
|
106
106
|
const vercelBuildEnv_js_1 = require("./vercelBuildEnv.js");
|
|
107
|
+
const vercelEnvMask_js_1 = require("./vercelEnvMask.js");
|
|
107
108
|
const vercelProjectRelease_js_1 = require("./vercelProjectRelease.js");
|
|
108
109
|
const projectTooling_js_1 = require("./projectTooling.js");
|
|
109
110
|
const localDevLock_js_1 = require("./localDevLock.js");
|
|
@@ -4631,6 +4632,30 @@ async function checkPnpm11Compatibility(cwd, packageJson, npmrcText) {
|
|
|
4631
4632
|
warnings: major === null || major < 11 ? findings : [],
|
|
4632
4633
|
};
|
|
4633
4634
|
}
|
|
4635
|
+
/**
|
|
4636
|
+
* Without Corepack, Vercel picks the pnpm version from the lockfile rather than
|
|
4637
|
+
* from `packageManager`, and an `engines.pnpm` range can then reject that pnpm
|
|
4638
|
+
* with ERR_PNPM_UNSUPPORTED_ENGINE. `packageManager` already records the
|
|
4639
|
+
* intended version, so removing the range is the advice; this is a warning
|
|
4640
|
+
* only.
|
|
4641
|
+
*/
|
|
4642
|
+
function checkPnpmEnginesWithPackageManager(packageJson) {
|
|
4643
|
+
const engines = packageJson.engines;
|
|
4644
|
+
if (!packageJson.packageManager?.startsWith("pnpm@") ||
|
|
4645
|
+
typeof engines !== "object" || engines === null ||
|
|
4646
|
+
engines.pnpm === undefined) {
|
|
4647
|
+
return { issues: [], suggestions: [], warnings: [] };
|
|
4648
|
+
}
|
|
4649
|
+
return {
|
|
4650
|
+
issues: [],
|
|
4651
|
+
suggestions: [
|
|
4652
|
+
"Remove package.json#engines.pnpm so it cannot reject the pnpm version Vercel selects; keep packageManager as the project's pnpm pin.",
|
|
4653
|
+
],
|
|
4654
|
+
warnings: [
|
|
4655
|
+
"package.json sets engines.pnpm beside a pnpm packageManager pin; Vercel builds without Corepack choose pnpm from the lockfile version, which engines.pnpm can reject with ERR_PNPM_UNSUPPORTED_ENGINE.",
|
|
4656
|
+
],
|
|
4657
|
+
};
|
|
4658
|
+
}
|
|
4634
4659
|
async function getSkillsContext(cwd, packageJson, manifest) {
|
|
4635
4660
|
const tooling = await (0, projectTooling_js_1.detectProjectTooling)(cwd, manifest?.project?.tooling);
|
|
4636
4661
|
const dependencyConfig = tooling.dependencies.config;
|
|
@@ -5226,6 +5251,124 @@ function workflowStepPreparesVercelProject(block) {
|
|
|
5226
5251
|
/vercel-production-env\.json\b/.test(block) &&
|
|
5227
5252
|
/\.vercel\/project\.json\b/.test(block);
|
|
5228
5253
|
}
|
|
5254
|
+
/**
|
|
5255
|
+
* Ways a workflow runs the Loom CLI: bare `loom`, through a package runner, as
|
|
5256
|
+
* `@gadicc/loom` fetched by `npx`, `pnpm dlx`, `bunx` or Deno, or by path as
|
|
5257
|
+
* `node_modules/.bin/loom`.
|
|
5258
|
+
*/
|
|
5259
|
+
const LOOM_INVOCATION = String
|
|
5260
|
+
.raw `(?:(?:pnpm\s+(?:exec|dlx)|pnpm|npm\s+exec(?:\s+--)?|npx(?:\s+(?:-y|--yes))?|yarn(?:\s+dlx)?|bunx|deno\s+task|deno\s+run\s+-A)\s+)?(?:(?:\.\/)?node_modules\/\.bin\/loom|(?:npm:)?@gadicc\/loom(?:@[^\s]+)?|loom)`;
|
|
5261
|
+
/**
|
|
5262
|
+
* Drops YAML and shell comments so a commented-out step or command is not
|
|
5263
|
+
* mistaken for one that runs. A `#` counts as a comment only at the start of
|
|
5264
|
+
* a line or after whitespace, which leaves URL fragments alone.
|
|
5265
|
+
*/
|
|
5266
|
+
function stripWorkflowComments(text) {
|
|
5267
|
+
return text.split("\n").filter((line) => !line.trim().startsWith("#")).map((line) => line.replace(/\s#.*$/, "")).join("\n");
|
|
5268
|
+
}
|
|
5269
|
+
/** Whether a step's `if:` is literally false, so it never runs. */
|
|
5270
|
+
function workflowStepIsDisabled(block) {
|
|
5271
|
+
return /^\s*(?:-\s+)?if:\s*(?:false|\$\{\{\s*false\s*\}\})\s*$/m.test(block);
|
|
5272
|
+
}
|
|
5273
|
+
/**
|
|
5274
|
+
* File arguments of `loom db release mask-env` commands the step runs. Only a
|
|
5275
|
+
* command in command position counts, so `echo 'loom db release mask-env …'`
|
|
5276
|
+
* does not.
|
|
5277
|
+
*/
|
|
5278
|
+
function loomMaskEnvFileArguments(block) {
|
|
5279
|
+
const joined = block.replace(/\\\r?\n\s*/g, " ");
|
|
5280
|
+
const pattern = new RegExp(String
|
|
5281
|
+
.raw `(?:^\s*(?:-\s+)?(?:run:\s*)?|[;&|]\s*)(?:[A-Za-z_][A-Za-z0-9_]*=\S*\s+)*${LOOM_INVOCATION}\s+db\s+release\s+mask-env\s+("[^"]*"|'[^']*'|[^\s;&|]+)`, "gm");
|
|
5282
|
+
return [...joined.matchAll(pattern)].map((match) => match[1].replace(/^(["'])(.*)\1$/, "$2"));
|
|
5283
|
+
}
|
|
5284
|
+
/**
|
|
5285
|
+
* The env file a `vercel pull` step writes, relative to `.vercel/`, or `null`
|
|
5286
|
+
* when the environment is computed at run time.
|
|
5287
|
+
*/
|
|
5288
|
+
function pulledVercelEnvFileName(block) {
|
|
5289
|
+
const joined = block.replace(/\\\r?\n\s*/g, " ");
|
|
5290
|
+
const environment = joined.match(/\s--environment(?:=|\s+)(["']?)([^\s"']+)\1/)?.[2] ?? (/\s--prod\b/.test(joined) ? "production" : "development");
|
|
5291
|
+
return /[$]/.test(environment) ? null : `.env.${environment}.local`;
|
|
5292
|
+
}
|
|
5293
|
+
/**
|
|
5294
|
+
* Whether masking `file` covers the file a pull wrote. A file named through a
|
|
5295
|
+
* shell variable (such as a copy in `$RUNNER_TEMP`) cannot be checked
|
|
5296
|
+
* statically and is accepted rather than reported.
|
|
5297
|
+
*/
|
|
5298
|
+
function maskedFileCoversPull(file, pulledFile) {
|
|
5299
|
+
if (file.includes("$"))
|
|
5300
|
+
return true;
|
|
5301
|
+
if (pulledFile === null) {
|
|
5302
|
+
return /(?:^|\/)\.vercel\/\.env\.[^/]+\.local$/.test(file);
|
|
5303
|
+
}
|
|
5304
|
+
return file === `.vercel/${pulledFile}` ||
|
|
5305
|
+
file.endsWith(`/.vercel/${pulledFile}`);
|
|
5306
|
+
}
|
|
5307
|
+
/**
|
|
5308
|
+
* `.vercel/.env.*` paths an inline `::add-mask::` step names. Segments such as
|
|
5309
|
+
* `${VERCEL_TARGET_ENV}` are kept, so the path reads as a shell variable.
|
|
5310
|
+
*/
|
|
5311
|
+
function inlineMaskedVercelEnvFiles(block) {
|
|
5312
|
+
if (!block.includes("::add-mask::"))
|
|
5313
|
+
return [];
|
|
5314
|
+
return [
|
|
5315
|
+
...block.matchAll(/[^\s"'`=]*\.vercel\/\.env\.(?:[\w.-]|\$\{[A-Za-z_]\w*\}|\$[A-Za-z_]\w*)+/g),
|
|
5316
|
+
].map((match) => match[0].replace(/[.-]+$/, ""));
|
|
5317
|
+
}
|
|
5318
|
+
/**
|
|
5319
|
+
* Checks that each `vercel pull` step is followed, in the same job, by an
|
|
5320
|
+
* enabled step that masks the file it wrote. Reports pulls that nothing masks,
|
|
5321
|
+
* and an inline `::add-mask::` script that could use `loom db release
|
|
5322
|
+
* mask-env` instead (also when the env file came from another Loom command).
|
|
5323
|
+
*/
|
|
5324
|
+
function checkPulledVercelEnvMasking(workflowText) {
|
|
5325
|
+
let unmaskedPull = false;
|
|
5326
|
+
let inlineMaskBlock;
|
|
5327
|
+
let loomMasksAnyVercelEnv = false;
|
|
5328
|
+
for (const job of getGithubWorkflowJobBlocks(workflowText)) {
|
|
5329
|
+
const steps = job.stepBlocks.map(stripWorkflowComments).filter((block) => !workflowStepIsDisabled(block));
|
|
5330
|
+
for (const block of steps) {
|
|
5331
|
+
if (loomMaskEnvFileArguments(block).some((file) => maskedFileCoversPull(file, null)))
|
|
5332
|
+
loomMasksAnyVercelEnv = true;
|
|
5333
|
+
if (!inlineMaskBlock && !loomMaskEnvFileArguments(block).length &&
|
|
5334
|
+
inlineMaskedVercelEnvFiles(block).length)
|
|
5335
|
+
inlineMaskBlock = block;
|
|
5336
|
+
}
|
|
5337
|
+
steps.forEach((block, index) => {
|
|
5338
|
+
if (!workflowStepUsesVercelCommand(block, "pull"))
|
|
5339
|
+
return;
|
|
5340
|
+
const pulledFile = pulledVercelEnvFileName(block);
|
|
5341
|
+
const later = steps.slice(index + 1);
|
|
5342
|
+
if (later.some((step) => loomMaskEnvFileArguments(step).some((file) => maskedFileCoversPull(file, pulledFile))))
|
|
5343
|
+
return;
|
|
5344
|
+
if (later.some((step) => inlineMaskedVercelEnvFiles(step).some((file) => maskedFileCoversPull(file, pulledFile))))
|
|
5345
|
+
return;
|
|
5346
|
+
unmaskedPull = true;
|
|
5347
|
+
});
|
|
5348
|
+
}
|
|
5349
|
+
return {
|
|
5350
|
+
inlineMaskBlock: loomMasksAnyVercelEnv ? undefined : inlineMaskBlock,
|
|
5351
|
+
unmaskedPull,
|
|
5352
|
+
};
|
|
5353
|
+
}
|
|
5354
|
+
/**
|
|
5355
|
+
* The replacement for an inline masking step, invoking Loom the way the
|
|
5356
|
+
* workflow already does (for example `pnpm exec loom` or `npx @gadicc/loom`)
|
|
5357
|
+
* so the suggestion follows the app's tooling instead of assuming one.
|
|
5358
|
+
*/
|
|
5359
|
+
function loomMaskEnvWorkflowStep(workflowText, inlineMaskBlock) {
|
|
5360
|
+
const envFile = inlineMaskedVercelEnvFiles(inlineMaskBlock)[0] ??
|
|
5361
|
+
".vercel/.env.production.local";
|
|
5362
|
+
const invocation = workflowText.match(new RegExp(String.raw `(?:^|[\s;&|(])(${LOOM_INVOCATION})\s+(?:db|check|init|dev)\b`, "m"))?.[1]?.replace(/\s+/g, " ") ??
|
|
5363
|
+
// No Loom command yet: follow the workflow's pnpm usage when it has one.
|
|
5364
|
+
(/(?:^|[\s;&|(])pnpm\s+(?:install|exec|run|dlx)\b/m.test(workflowText)
|
|
5365
|
+
? "pnpm exec loom"
|
|
5366
|
+
: "loom");
|
|
5367
|
+
return [
|
|
5368
|
+
" - name: Mask pulled Vercel values",
|
|
5369
|
+
` run: ${invocation} db release mask-env ${envFile}`,
|
|
5370
|
+
].join("\n");
|
|
5371
|
+
}
|
|
5229
5372
|
function workflowStepPreparesVercelBuildEnv(block) {
|
|
5230
5373
|
return (/\bvercel-build-env(?:\.mjs)?\b[\s\S]*\bprepare\b/.test(block) ||
|
|
5231
5374
|
/\bloom\b[\s\S]*\bdb\s+release\s+prepare-build-env\b/.test(block));
|
|
@@ -5679,11 +5822,15 @@ async function checkGithubActionsWorkflows(cwd) {
|
|
|
5679
5822
|
warnings.push(`GitHub Actions workflow exposes VERCEL_TOKEN for an entire workflow or job: ${relativePath}`);
|
|
5680
5823
|
suggestions.add("Keep VERCEL_TOKEN in a protected GitHub Environment and bind it only on steps that call Vercel.");
|
|
5681
5824
|
}
|
|
5682
|
-
const
|
|
5683
|
-
|
|
5684
|
-
if (pullsVercelEnv && !masksPulledVercelEnv) {
|
|
5825
|
+
const masking = checkPulledVercelEnvMasking(normalized);
|
|
5826
|
+
if (masking.unmaskedPull) {
|
|
5685
5827
|
warnings.push(`GitHub Actions workflow pulls Vercel secrets without masking the downloaded values: ${relativePath}`);
|
|
5686
|
-
suggestions.add("Immediately after `vercel pull`,
|
|
5828
|
+
suggestions.add("Immediately after `vercel pull`, add a step in the same job that runs `loom db release mask-env .vercel/.env.<target>.local` so GitHub masks every secret-capable pulled value.");
|
|
5829
|
+
}
|
|
5830
|
+
if (masking.inlineMaskBlock) {
|
|
5831
|
+
warnings.push(`GitHub Actions workflow masks pulled Vercel values with its own \`::add-mask::\` script instead of \`loom db release mask-env\`: ${relativePath}`);
|
|
5832
|
+
suggestions.add("Replace the inline Vercel masking step with Loom's shared rule, which reads the file directly, skips only short and public-by-construction values, and masks multi-line values line by line:\n" +
|
|
5833
|
+
loomMaskEnvWorkflowStep(stripWorkflowComments(normalized), masking.inlineMaskBlock));
|
|
5687
5834
|
}
|
|
5688
5835
|
}
|
|
5689
5836
|
return {
|
|
@@ -14437,6 +14584,11 @@ async function checkProject(cwd, env = node_process_1.default.env, options = {})
|
|
|
14437
14584
|
for (const suggestion of pnpmCompatibilityCheck.suggestions) {
|
|
14438
14585
|
suggestions.add(suggestion);
|
|
14439
14586
|
}
|
|
14587
|
+
const pnpmEnginesCheck = checkPnpmEnginesWithPackageManager(packageJson);
|
|
14588
|
+
warnings.push(...pnpmEnginesCheck.warnings);
|
|
14589
|
+
for (const suggestion of pnpmEnginesCheck.suggestions) {
|
|
14590
|
+
suggestions.add(suggestion);
|
|
14591
|
+
}
|
|
14440
14592
|
const framework = await detectFramework(cwd, packageJson);
|
|
14441
14593
|
const dependency = packageJson.dependencies?.[exports.LOOM_DEPENDENCY];
|
|
14442
14594
|
if (!dependency) {
|
|
@@ -15118,6 +15270,7 @@ function printHelp({ out }) {
|
|
|
15118
15270
|
out(" db release trust-apply <plan> <approval-sha256> Apply a reviewed Trusted Sources plan.");
|
|
15119
15271
|
out(" db release trust-check <plan> Verify the reviewed Trusted Sources plan is active.");
|
|
15120
15272
|
out(" db release prepare-build-env <env> <metadata> <policy> <manifest> Prepare metadata-backed placeholders for an external Vercel build.");
|
|
15273
|
+
out(" db release mask-env <env> Print GitHub Actions ::add-mask:: commands for secret-capable pulled Vercel values.");
|
|
15121
15274
|
out(" db release prepare-vercel-project production <env> <metadata> <project> Materialize project-scoped Production release inputs.");
|
|
15122
15275
|
out(" db release promote-vercel <deployment-id> Promote an exact READY Production deployment with project-scoped auth.");
|
|
15123
15276
|
out(" db release verify-build-env <output> <manifest> [deployment-root] Reject build-only placeholders in a deployable Vercel artifact.");
|
|
@@ -16377,6 +16530,13 @@ async function runDbRelease(cwd, command, args, io, options) {
|
|
|
16377
16530
|
}, io);
|
|
16378
16531
|
return 0;
|
|
16379
16532
|
}
|
|
16533
|
+
case "mask-env": {
|
|
16534
|
+
if (args.length !== 1) {
|
|
16535
|
+
io.err("Usage: loom db release mask-env <env-file>");
|
|
16536
|
+
return 1;
|
|
16537
|
+
}
|
|
16538
|
+
return (0, vercelEnvMask_js_1.maskVercelPulledEnvironment)({ env: node_process_1.default.env, envFile: (0, node_path_1.resolve)(cwd, args[0]) }, io);
|
|
16539
|
+
}
|
|
16380
16540
|
case "verify-build-env": {
|
|
16381
16541
|
if (args.length < 2 || args.length > 3) {
|
|
16382
16542
|
io.err("Usage: loom db release verify-build-env <output-directory> <manifest-file> [deployment-root]");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vercelBuildEnv.d.ts","sourceRoot":"","sources":["../../../src/src/cli/vercelBuildEnv.ts"],"names":[],"mappings":"AAwCA,6EAA6E;AAC7E,MAAM,MAAM,iCAAiC,GAAG;IAC9C;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,uEAAuE;IACvE,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,0DAA0D;IAC1D,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,8DAA8D;IAC9D,WAAW,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7C,sEAAsE;IACtE,cAAc,EAAE,OAAO,CAAC;IACxB,mEAAmE;IACnE,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAMF,KAAK,gBAAgB,GAAG;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAMF,KAAK,SAAS,GAAG;IACf,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7B,CAAC;AAkDF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,WAG5D;
|
|
1
|
+
{"version":3,"file":"vercelBuildEnv.d.ts","sourceRoot":"","sources":["../../../src/src/cli/vercelBuildEnv.ts"],"names":[],"mappings":"AAwCA,6EAA6E;AAC7E,MAAM,MAAM,iCAAiC,GAAG;IAC9C;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,uEAAuE;IACvE,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,0DAA0D;IAC1D,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,8DAA8D;IAC9D,WAAW,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7C,sEAAsE;IACtE,cAAc,EAAE,OAAO,CAAC;IACxB,mEAAmE;IACnE,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAMF,KAAK,gBAAgB,GAAG;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAMF,KAAK,SAAS,GAAG;IACf,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7B,CAAC;AAkDF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,WAG5D;AAqID;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,OAAO,GACd,iCAAiC,EAAE,CAUrC;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,EACE,OAAO,EACP,YAAY,EACZ,YAAY,EACZ,UAAU,GACX,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB,EACD,EAAE,GAAE,SAAgD;;EAoJrD;AA0MD;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,EACE,cAAc,EACd,YAAY,EACZ,eAAe,GAChB,EAAE;IACD,yEAAyE;IACzE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;CACzB,EACD,EAAE,GAAE,SAAgD,QA8CrD"}
|
|
@@ -7,7 +7,7 @@ exports.verifyVercelBuildArtifact = verifyVercelBuildArtifact;
|
|
|
7
7
|
const node_crypto_1 = require("node:crypto");
|
|
8
8
|
const node_fs_1 = require("node:fs");
|
|
9
9
|
const node_path_1 = require("node:path");
|
|
10
|
-
const
|
|
10
|
+
const vercelPulledEnv_js_1 = require("./vercelPulledEnv.js");
|
|
11
11
|
function readJson(path) {
|
|
12
12
|
return JSON.parse((0, node_fs_1.readFileSync)(path, "utf8"));
|
|
13
13
|
}
|
|
@@ -65,11 +65,28 @@ function setEnvValue(source, key, value) {
|
|
|
65
65
|
throw new Error(`Invalid environment variable key in policy: ${key}`);
|
|
66
66
|
}
|
|
67
67
|
const line = `${key}=${JSON.stringify(value)}`;
|
|
68
|
-
const
|
|
69
|
-
if (
|
|
70
|
-
return source.
|
|
68
|
+
const entries = (0, vercelPulledEnv_js_1.parsePulledEnv)(source).entries.filter((entry) => entry.key === key);
|
|
69
|
+
if (!entries.length)
|
|
70
|
+
return `${source.trimEnd()}\n${line}\n`;
|
|
71
|
+
// Every assignment of the key is replaced, so no reader can keep an earlier
|
|
72
|
+
// or later (empty) duplicate. Lines are split on real line breaks only:
|
|
73
|
+
// Vercel writes U+2028 and U+2029 unescaped, and a multiline `^…$` regex
|
|
74
|
+
// would end the line there and leave the rest of the old value behind.
|
|
75
|
+
const parts = source.split(/(\r\n|\r|\n)/);
|
|
76
|
+
const texts = parts.filter((_, index) => index % 2 === 0);
|
|
77
|
+
const breaks = parts.filter((_, index) => index % 2 === 1);
|
|
78
|
+
const replaced = new Set(entries.map((entry) => entry.line - 1));
|
|
79
|
+
const continued = new Set(entries.flatMap((entry) => Array.from({ length: entry.endLine - entry.line }, (_, offset) => entry.line + offset)));
|
|
80
|
+
let output = "";
|
|
81
|
+
for (let index = 0; index < texts.length; index++) {
|
|
82
|
+
if (continued.has(index))
|
|
83
|
+
continue;
|
|
84
|
+
let end = index;
|
|
85
|
+
while (continued.has(end + 1))
|
|
86
|
+
end++;
|
|
87
|
+
output += (replaced.has(index) ? line : texts[index]) + (breaks[end] ?? "");
|
|
71
88
|
}
|
|
72
|
-
return
|
|
89
|
+
return output;
|
|
73
90
|
}
|
|
74
91
|
function parsePolicyRequirement(value, index) {
|
|
75
92
|
if (typeof value !== "object" || value === null) {
|
|
@@ -149,7 +166,7 @@ function parseVercelBuildEnvironmentPolicy(policy) {
|
|
|
149
166
|
*/
|
|
150
167
|
function prepareVercelBuildEnvironment({ envFile, manifestFile, metadataFile, policyFile, }, io = { out: (line) => console.log(line) }) {
|
|
151
168
|
let envSource = (0, node_fs_1.readFileSync)(envFile, "utf8");
|
|
152
|
-
const pulledValues = (0,
|
|
169
|
+
const pulledValues = (0, vercelPulledEnv_js_1.parsePulledEnv)(envSource).values;
|
|
153
170
|
const metadata = readJson(metadataFile);
|
|
154
171
|
const policy = readJson(policyFile);
|
|
155
172
|
const envs = typeof metadata === "object" && metadata !== null
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { type PulledEnvEntry } from "./vercelPulledEnv.js";
|
|
2
|
+
type CliOutput = {
|
|
3
|
+
err: (line: string) => void;
|
|
4
|
+
out: (line: string) => void;
|
|
5
|
+
};
|
|
6
|
+
/**
|
|
7
|
+
* Values shorter than this are not masked. A value this short is too small to
|
|
8
|
+
* be a meaningful secret, and GitHub masks every occurrence of a registered
|
|
9
|
+
* value in later log lines, so masking `1`, `true` or `production` would turn
|
|
10
|
+
* unrelated output into `***`.
|
|
11
|
+
*/
|
|
12
|
+
export declare const MIN_MASKED_VALUE_LENGTH = 8;
|
|
13
|
+
/** Whether a pulled variable's value is public by construction. */
|
|
14
|
+
export declare function isPublicPulledEnvName(name: string): boolean;
|
|
15
|
+
/**
|
|
16
|
+
* Returns the de-duplicated `::add-mask::` workflow commands for the entries
|
|
17
|
+
* of a parsed env file. An entry is skipped when its name is public by
|
|
18
|
+
* construction; otherwise its on-disk text, decoded value and trimmed value
|
|
19
|
+
* are each registered unless shorter than {@link MIN_MASKED_VALUE_LENGTH}.
|
|
20
|
+
* Registering every form costs only readability and covers whichever one a
|
|
21
|
+
* tool prints. A multi-line value is also registered line by line, without
|
|
22
|
+
* line terminators, because GitHub matches masks against each log line.
|
|
23
|
+
*/
|
|
24
|
+
export declare function pulledEnvMaskCommands(entries: Iterable<Pick<PulledEnvEntry, "alternateRaw" | "key" | "raw" | "value">>): string[];
|
|
25
|
+
/**
|
|
26
|
+
* Implements `loom db release mask-env <env-file>`: reads a pulled Vercel env
|
|
27
|
+
* file directly (so a process variable of the same name cannot shadow the
|
|
28
|
+
* file's value) and writes one `::add-mask::` command per secret-capable value.
|
|
29
|
+
* Nothing else reaches stdout, and failures name neither variables nor values.
|
|
30
|
+
* Refuses outside GitHub Actions, where the commands would print the values
|
|
31
|
+
* instead of registering masks.
|
|
32
|
+
*/
|
|
33
|
+
export declare function maskVercelPulledEnvironment({ env, envFile }: {
|
|
34
|
+
env: Record<string, string | undefined>;
|
|
35
|
+
envFile: string;
|
|
36
|
+
}, io: CliOutput): 1 | 0;
|
|
37
|
+
export {};
|
|
38
|
+
//# sourceMappingURL=vercelEnvMask.d.ts.map
|