@mp-lb/arcnet 0.7.6 → 0.7.8
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 +3 -1
- package/dist/arcnetConfig.d.ts +7 -7
- package/dist/arcnetConfig.d.ts.map +1 -1
- package/dist/arcnetConfig.js +5 -2
- package/dist/arcnetConfig.js.map +1 -1
- package/dist/compileArcnet.d.ts.map +1 -1
- package/dist/compileArcnet.js +21 -1
- package/dist/compileArcnet.js.map +1 -1
- package/dist/createCli.d.ts.map +1 -1
- package/dist/createCli.js +7 -1
- package/dist/createCli.js.map +1 -1
- package/dist/domains/checkZoneAccess.d.ts +5 -0
- package/dist/domains/checkZoneAccess.d.ts.map +1 -0
- package/dist/domains/checkZoneAccess.js +23 -0
- package/dist/domains/checkZoneAccess.js.map +1 -0
- package/dist/domains/requiredZones.d.ts +3 -0
- package/dist/domains/requiredZones.d.ts.map +1 -0
- package/dist/domains/requiredZones.js +25 -0
- package/dist/domains/requiredZones.js.map +1 -0
- package/dist/schemas.d.ts +1 -1
- package/dist/schemas.d.ts.map +1 -1
- package/dist/schemas.js +12 -4
- package/dist/schemas.js.map +1 -1
- package/docs/public/llms-full.txt +3 -1
- package/package.json +1 -1
- package/src/arcnetConfig.ts +5 -2
- package/src/compileArcnet.ts +40 -9
- package/src/createCli.ts +18 -1
- package/src/domains/checkZoneAccess.ts +46 -0
- package/src/domains/requiredZones.ts +38 -0
- package/src/schemas.ts +14 -4
package/README.md
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
# @mp-lb/arcnet
|
|
2
2
|
|
|
3
|
+
For Vercel sites, the shared non-secret `ARCNET_VERCEL_ACCOUNT_ID` can come from the environment's standard variables snapshot. Run `arcnet variables sync` before setup when that snapshot is new. An explicit `vercel.account` in project YAML remains supported.
|
|
4
|
+
|
|
3
5
|
ArcNet installs selected delivery capabilities into a Zap/pnpm/GitHub project. The project owns one `.arcnet/arcnet.yaml`; this package owns the standard environment preset, runners, validation and workflow templates. [Project setup](https://github.com/mp-lb/stackforge/blob/main/arcnet/SETUP.md) · [File tree](https://github.com/mp-lb/stackforge/blob/main/arcnet/README.md) · [Command reference](docs/public/commands.md)
|
|
4
6
|
|
|
5
7
|
```sh
|
|
@@ -23,4 +25,4 @@ For a new Vercel site, set `mode: new`, `creationApproved: true`, and its `proje
|
|
|
23
25
|
|
|
24
26
|
In GitHub Actions, secret commands require the configured repository on `main`. A desktop release may also use `arcnet env export --consumer desktop` on a version tag (`v<major>.<minor>.<patch>`); other consumers remain restricted to `main`.
|
|
25
27
|
|
|
26
|
-
|
|
28
|
+
The standing `CLOUDFLARE_API_TOKEN` should have Zone Read and DNS Write for all zones in the environment's Cloudflare account, including future zones. Then a new zone needs only a change to `.arcnet/arcnet.yaml` and a push; deployment checks zone access before Terraform or Vercel changes. Google Cloud Run domain mapping also requires base-domain ownership: `arcnet environment domain-owner` delegates an already verified domain to the deploy account. Declarative Vercel domain attachment and DNS reconciliation are supported; project domain add/remove CLI and full environment bootstrap/teardown remain unimplemented.
|
package/dist/arcnetConfig.d.ts
CHANGED
|
@@ -16,13 +16,6 @@ declare const arcnetConfigSchema: z.ZodObject<{
|
|
|
16
16
|
serviceAccount: z.ZodDefault<z.ZodString>;
|
|
17
17
|
}, z.core.$strict>>;
|
|
18
18
|
vercel: z.ZodOptional<z.ZodObject<{
|
|
19
|
-
account: z.ZodObject<{
|
|
20
|
-
type: z.ZodEnum<{
|
|
21
|
-
team: "team";
|
|
22
|
-
personal: "personal";
|
|
23
|
-
}>;
|
|
24
|
-
id: z.ZodString;
|
|
25
|
-
}, z.core.$strict>;
|
|
26
19
|
sites: z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
27
20
|
mode: z.ZodEnum<{
|
|
28
21
|
existing: "existing";
|
|
@@ -46,6 +39,13 @@ declare const arcnetConfigSchema: z.ZodObject<{
|
|
|
46
39
|
}, z.core.$strict>>;
|
|
47
40
|
}, z.core.$strict>>;
|
|
48
41
|
dnsZone: z.ZodOptional<z.ZodString>;
|
|
42
|
+
account: z.ZodOptional<z.ZodObject<{
|
|
43
|
+
type: z.ZodEnum<{
|
|
44
|
+
team: "team";
|
|
45
|
+
personal: "personal";
|
|
46
|
+
}>;
|
|
47
|
+
id: z.ZodString;
|
|
48
|
+
}, z.core.$strict>>;
|
|
49
49
|
}, z.core.$strict>>;
|
|
50
50
|
variables: z.ZodOptional<z.ZodUnion<readonly [z.ZodRecord<z.ZodString, z.ZodString>, z.ZodObject<{
|
|
51
51
|
store: z.ZodString;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arcnetConfig.d.ts","sourceRoot":"","sources":["../src/arcnetConfig.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA8BxB,eAAO,MAAM,oBAAoB;;;kBAKtB,CAAC;AAEZ,QAAA,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"arcnetConfig.d.ts","sourceRoot":"","sources":["../src/arcnetConfig.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA8BxB,eAAO,MAAM,oBAAoB;;;kBAKtB,CAAC;AAEZ,QAAA,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA6Bb,CAAC;AAEZ,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9D,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,WACV,CAAC;AAEpC,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,YACR,CAAC;AAErC,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,KAAG,YAW/C,CAAC"}
|
package/dist/arcnetConfig.js
CHANGED
|
@@ -3,7 +3,7 @@ import { join } from "node:path";
|
|
|
3
3
|
import { parse } from "yaml";
|
|
4
4
|
import { z } from "zod";
|
|
5
5
|
import { deployBlockSchema } from "@mp-lb/zapper/dist/arc/schemas.js";
|
|
6
|
-
import { vercelInputSchema } from "./schemas.js";
|
|
6
|
+
import { accountSchema, vercelInputSchema } from "./schemas.js";
|
|
7
7
|
import { secretsConfigSchema, simpleSourceSchema } from "./secrets/config.js";
|
|
8
8
|
const slug = z
|
|
9
9
|
.string()
|
|
@@ -42,7 +42,10 @@ const arcnetConfigSchema = z
|
|
|
42
42
|
})
|
|
43
43
|
.strict()
|
|
44
44
|
.optional(),
|
|
45
|
-
vercel: vercelInputSchema
|
|
45
|
+
vercel: vercelInputSchema
|
|
46
|
+
.omit({ repository: true, account: true })
|
|
47
|
+
.extend({ account: accountSchema.optional() })
|
|
48
|
+
.optional(),
|
|
46
49
|
variables: z.union([inlineVariables, forumVariablesSchema]).optional(),
|
|
47
50
|
secrets: z
|
|
48
51
|
.object({
|
package/dist/arcnetConfig.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arcnetConfig.js","sourceRoot":"","sources":["../src/arcnetConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"arcnetConfig.js","sourceRoot":"","sources":["../src/arcnetConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileArcnet.d.ts","sourceRoot":"","sources":["../src/compileArcnet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"compileArcnet.d.ts","sourceRoot":"","sources":["../src/compileArcnet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKtD,eAAO,MAAM,UAAU,GAAI,QAAQ,YAAY,iDAO5B,CAAC;AAEpB,eAAO,MAAM,aAAa,GAAI,QAAQ,YAAY,EAAE,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+B/D,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,QAAQ,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0EpD,CAAC"}
|
package/dist/compileArcnet.js
CHANGED
|
@@ -1,10 +1,29 @@
|
|
|
1
1
|
import { deployBlockSchema } from "@mp-lb/zapper/dist/arc/schemas.js";
|
|
2
2
|
import { resolveEnvironment } from "./resolveEnvironment.js";
|
|
3
3
|
import { validateConfig } from "./validateConfig.js";
|
|
4
|
-
|
|
4
|
+
import { readVariables } from "./variables.js";
|
|
5
|
+
export const arcnetMode = (config) => config.vercel && config.services
|
|
6
|
+
? "mixed"
|
|
7
|
+
: config.vercel
|
|
8
|
+
? "vercel"
|
|
9
|
+
: config.services
|
|
10
|
+
? "terraform"
|
|
11
|
+
: "package";
|
|
5
12
|
export const compileVercel = (config, root) => {
|
|
6
13
|
if (!config.vercel)
|
|
7
14
|
throw new Error("No Vercel sites selected.");
|
|
15
|
+
const account = config.vercel.account ??
|
|
16
|
+
(() => {
|
|
17
|
+
const id = readVariables(root, config).ARCNET_VERCEL_ACCOUNT_ID;
|
|
18
|
+
if (!id)
|
|
19
|
+
throw new Error("Vercel account missing. Add ARCNET_VERCEL_ACCOUNT_ID to the environment's standard variables, run arcnet variables sync, or set vercel.account in arcnet.yaml.");
|
|
20
|
+
return {
|
|
21
|
+
type: id.startsWith("team_")
|
|
22
|
+
? "team"
|
|
23
|
+
: "personal",
|
|
24
|
+
id,
|
|
25
|
+
};
|
|
26
|
+
})();
|
|
8
27
|
return validateConfig({
|
|
9
28
|
version: 1,
|
|
10
29
|
mode: "vercel",
|
|
@@ -12,6 +31,7 @@ export const compileVercel = (config, root) => {
|
|
|
12
31
|
repository: config.repository,
|
|
13
32
|
approved: config.approved,
|
|
14
33
|
...config.vercel,
|
|
34
|
+
account,
|
|
15
35
|
}, root);
|
|
16
36
|
};
|
|
17
37
|
export const compileTerraform = (config) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileArcnet.js","sourceRoot":"","sources":["../src/compileArcnet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"compileArcnet.js","sourceRoot":"","sources":["../src/compileArcnet.ts"],"names":[],"mappings":"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"}
|
package/dist/createCli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createCli.d.ts","sourceRoot":"","sources":["../src/createCli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"createCli.d.ts","sourceRoot":"","sources":["../src/createCli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwBpC,eAAO,MAAM,SAAS,eAqNrB,CAAC"}
|
package/dist/createCli.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { Command } from "commander";
|
|
2
|
-
import { appendFileSync, readFileSync, realpathSync } from "node:fs";
|
|
2
|
+
import { appendFileSync, existsSync, readFileSync, realpathSync, } from "node:fs";
|
|
3
3
|
import { join } from "node:path";
|
|
4
4
|
import { z } from "zod";
|
|
5
5
|
import { ciOutputs } from "./ciOutputs.js";
|
|
6
6
|
import { grantDomainOwner } from "./environment/grantDomainOwner.js";
|
|
7
|
+
import { checkZoneAccess } from "./domains/checkZoneAccess.js";
|
|
7
8
|
import { createSetupCommand } from "./createSetupCommand.js";
|
|
8
9
|
import { packageVersion } from "./packageInfo.js";
|
|
9
10
|
import { renderResult } from "./renderResult.js";
|
|
@@ -83,6 +84,9 @@ export const createCli = () => {
|
|
|
83
84
|
command.argument("<site>", "Configured site name");
|
|
84
85
|
command.action(async (site) => {
|
|
85
86
|
const root = realpathSync(cli.opts().root);
|
|
87
|
+
if (!hasArcnetConfig(root) &&
|
|
88
|
+
!existsSync(join(root, ".arcnet/project.json")))
|
|
89
|
+
throw new Error("Project is not configured. Create .arcnet/arcnet.yaml and run arcnet setup <project-slug> first.");
|
|
86
90
|
const mode = hasArcnetConfig(root)
|
|
87
91
|
? arcnetMode(readArcnetConfig(root))
|
|
88
92
|
: z
|
|
@@ -90,6 +94,8 @@ export const createCli = () => {
|
|
|
90
94
|
.parse(JSON.parse(readFileSync(join(root, ".arcnet/project.json"), "utf8"))).mode;
|
|
91
95
|
const machine = Boolean(cli.opts().json || cli.opts().jsonl);
|
|
92
96
|
const execute = async () => {
|
|
97
|
+
if (name === "deploy" && hasArcnetConfig(root))
|
|
98
|
+
await checkZoneAccess(readArcnetConfig(root));
|
|
93
99
|
if (mode === "package") {
|
|
94
100
|
if (name === "check" || name === "plan")
|
|
95
101
|
return {
|
package/dist/createCli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createCli.js","sourceRoot":"","sources":["../src/createCli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,
|
|
1
|
+
{"version":3,"file":"createCli.js","sourceRoot":"","sources":["../src/createCli.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"checkZoneAccess.d.ts","sourceRoot":"","sources":["../../src/domains/checkZoneAccess.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKvD,eAAO,MAAM,eAAe,GAC1B,QAAQ,YAAY,EACpB,0BAAwC,EACxC,UAAS,OAAO,KAAa;;EAqC9B,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { requiredZones } from "./requiredZones.js";
|
|
2
|
+
export const checkZoneAccess = async (config, token = process.env.CLOUDFLARE_API_TOKEN, request = fetch) => {
|
|
3
|
+
const zones = requiredZones(config);
|
|
4
|
+
if (!zones.length)
|
|
5
|
+
return { zones };
|
|
6
|
+
if (!token)
|
|
7
|
+
throw new Error("CLOUDFLARE_API_TOKEN is required for configured domains.");
|
|
8
|
+
for (const name of zones) {
|
|
9
|
+
const url = new URL("https://api.cloudflare.com/client/v4/zones");
|
|
10
|
+
url.searchParams.set("name", name);
|
|
11
|
+
const response = await request(url, {
|
|
12
|
+
headers: { Authorization: `Bearer ${token}` },
|
|
13
|
+
});
|
|
14
|
+
if (!response.ok)
|
|
15
|
+
throw new Error(`ArcNet deployment token cannot inspect Cloudflare zone ${name} (${response.status}). Give the CI token Zone Read and DNS Write for all zones in the environment account.`);
|
|
16
|
+
const body = (await response.json());
|
|
17
|
+
if (!body.success ||
|
|
18
|
+
!body.result?.some((zone) => zone.name === name && zone.status === "active"))
|
|
19
|
+
throw new Error(`ArcNet deployment token cannot access active Cloudflare zone ${name}. Give the CI token Zone Read and DNS Write for all zones in the environment account.`);
|
|
20
|
+
}
|
|
21
|
+
return { zones };
|
|
22
|
+
};
|
|
23
|
+
//# sourceMappingURL=checkZoneAccess.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"checkZoneAccess.js","sourceRoot":"","sources":["../../src/domains/checkZoneAccess.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAInD,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,MAAoB,EACpB,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,EACxC,UAAwB,KAAK,EAC7B,EAAE;IACF,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IACpC,IAAI,CAAC,KAAK,CAAC,MAAM;QAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IACpC,IAAI,CAAC,KAAK;QACR,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAE9E,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,4CAA4C,CAAC,CAAC;QAClE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAEnC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE;YAClC,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE;SAC9C,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE;YACd,MAAM,IAAI,KAAK,CACb,0DAA0D,IAAI,KAAK,QAAQ,CAAC,MAAM,wFAAwF,CAC3K,CAAC;QAEJ,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAGlC,CAAC;QAEF,IACE,CAAC,IAAI,CAAC,OAAO;YACb,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAChB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,CACzD;YAED,MAAM,IAAI,KAAK,CACb,gEAAgE,IAAI,uFAAuF,CAC5J,CAAC;IACN,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,CAAC;AACnB,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"requiredZones.d.ts","sourceRoot":"","sources":["../../src/domains/requiredZones.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGvD,eAAO,MAAM,aAAa,GAAI,QAAQ,YAAY,aAkCjD,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { compileTerraform } from "../compileArcnet.js";
|
|
2
|
+
export const requiredZones = (config) => {
|
|
3
|
+
const zones = new Set();
|
|
4
|
+
if (config.services) {
|
|
5
|
+
const { deployment, network } = compileTerraform(config);
|
|
6
|
+
for (const service of Object.values(deployment.services)) {
|
|
7
|
+
if (service.module !== "cloud-run-web" &&
|
|
8
|
+
service.module !== "vercel-static")
|
|
9
|
+
continue;
|
|
10
|
+
const zone = service["dns-zone"] ?? network.dns.zone;
|
|
11
|
+
if (!service.domain ||
|
|
12
|
+
(service.domain !== zone && !service.domain.endsWith(`.${zone}`)))
|
|
13
|
+
throw new Error(`Domain ${service.domain ?? "(missing)"} is outside DNS zone ${zone}.`);
|
|
14
|
+
zones.add(zone);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
if (config.vercel &&
|
|
18
|
+
Object.values(config.vercel.sites).some((site) => site.domain)) {
|
|
19
|
+
if (!config.vercel.dnsZone)
|
|
20
|
+
throw new Error("Vercel custom domains require vercel.dnsZone.");
|
|
21
|
+
zones.add(config.vercel.dnsZone);
|
|
22
|
+
}
|
|
23
|
+
return [...zones].sort();
|
|
24
|
+
};
|
|
25
|
+
//# sourceMappingURL=requiredZones.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"requiredZones.js","sourceRoot":"","sources":["../../src/domains/requiredZones.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAoB,EAAE,EAAE;IACpD,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAEhC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpB,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAEzD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzD,IACE,OAAO,CAAC,MAAM,KAAK,eAAe;gBAClC,OAAO,CAAC,MAAM,KAAK,eAAe;gBAElC,SAAS;YACX,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;YACrD,IACE,CAAC,OAAO,CAAC,MAAM;gBACf,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;gBAEjE,MAAM,IAAI,KAAK,CACb,UAAU,OAAO,CAAC,MAAM,IAAI,WAAW,wBAAwB,IAAI,GAAG,CACvE,CAAC;YACJ,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAED,IACE,MAAM,CAAC,MAAM;QACb,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAC9D,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO;YACxB,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACnE,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAED,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;AAC3B,CAAC,CAAC"}
|
package/dist/schemas.d.ts
CHANGED
package/dist/schemas.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../src/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAQxB,
|
|
1
|
+
{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../src/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAQxB,eAAO,MAAM,aAAa;;;;;;kBAYvB,CAAC;AAEJ,QAAA,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;kBAwDb,CAAC;AAYJ,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAYnB,CAAC;AACZ,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAsB3B,CAAC;AACL,eAAO,MAAM,oBAAoB;;;;;;;;;iBAO/B,CAAC;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAC9D,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAC;AACpD,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAC1D,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAClE,MAAM,MAAM,aAAa,GAAG,CAC1B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,OAAO,KACX,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;AACpC,MAAM,MAAM,UAAU,GAAG,CACvB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAC1B,eAAO,MAAM,qBAAqB;;;;;;;;iBAQhC,CAAC;AACH,eAAO,MAAM,aAAa,uCAGzB,CAAC"}
|
package/dist/schemas.js
CHANGED
|
@@ -4,7 +4,7 @@ const projectName = z
|
|
|
4
4
|
.regex(/^[a-z0-9](?:[a-z0-9.-]{0,98}[a-z0-9])?$/)
|
|
5
5
|
.refine((v) => !v.includes("---"))
|
|
6
6
|
.refine((v) => !/REPLACE/i.test(v));
|
|
7
|
-
const accountSchema = z
|
|
7
|
+
export const accountSchema = z
|
|
8
8
|
.object({
|
|
9
9
|
type: z.enum(["team", "personal"]),
|
|
10
10
|
id: z
|
|
@@ -23,7 +23,10 @@ const siteSchema = z
|
|
|
23
23
|
.refine((v) => !/REPLACE/i.test(v))
|
|
24
24
|
.optional(),
|
|
25
25
|
projectName,
|
|
26
|
-
domain: z
|
|
26
|
+
domain: z
|
|
27
|
+
.string()
|
|
28
|
+
.regex(/^[a-z0-9.-]+\.[a-z]{2,}$/)
|
|
29
|
+
.optional(),
|
|
27
30
|
root: z.string().optional(),
|
|
28
31
|
framework: z.enum(["static", "vercel"]).optional(),
|
|
29
32
|
creationApproved: z.boolean().optional(),
|
|
@@ -64,7 +67,10 @@ export const vercelInputSchema = z
|
|
|
64
67
|
.string()
|
|
65
68
|
.regex(/^[A-Za-z0-9][A-Za-z0-9-]*\/[A-Za-z0-9][A-Za-z0-9._-]*$/),
|
|
66
69
|
account: accountSchema,
|
|
67
|
-
dnsZone: z
|
|
70
|
+
dnsZone: z
|
|
71
|
+
.string()
|
|
72
|
+
.regex(/^[a-z0-9.-]+\.[a-z]{2,}$/)
|
|
73
|
+
.optional(),
|
|
68
74
|
sites: sitesSchema,
|
|
69
75
|
})
|
|
70
76
|
.strict();
|
|
@@ -80,7 +86,9 @@ export const vercelConfigSchema = vercelInputSchema
|
|
|
80
86
|
for (const [name, site] of Object.entries(config.sites)) {
|
|
81
87
|
if (!site.domain)
|
|
82
88
|
continue;
|
|
83
|
-
if (!config.dnsZone ||
|
|
89
|
+
if (!config.dnsZone ||
|
|
90
|
+
(site.domain !== config.dnsZone &&
|
|
91
|
+
!site.domain.endsWith(`.${config.dnsZone}`)))
|
|
84
92
|
context.addIssue({
|
|
85
93
|
code: "custom",
|
|
86
94
|
path: ["sites", name, "domain"],
|
package/dist/schemas.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../src/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,WAAW,GAAG,CAAC;KAClB,MAAM,EAAE;KACR,KAAK,CAAC,yCAAyC,CAAC;KAChD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;KACjC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAEtC,MAAM,aAAa,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../src/schemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
# @mp-lb/arcnet
|
|
2
2
|
|
|
3
|
+
For Vercel sites, the shared non-secret `ARCNET_VERCEL_ACCOUNT_ID` can come from the environment's standard variables snapshot. Run `arcnet variables sync` before setup when that snapshot is new. An explicit `vercel.account` in project YAML remains supported.
|
|
4
|
+
|
|
3
5
|
ArcNet installs selected delivery capabilities into a Zap/pnpm/GitHub project. The project owns one `.arcnet/arcnet.yaml`; this package owns the standard environment preset, runners, validation and workflow templates. [Project setup](https://github.com/mp-lb/stackforge/blob/main/arcnet/SETUP.md) · [File tree](https://github.com/mp-lb/stackforge/blob/main/arcnet/README.md) · [Command reference](docs/public/commands.md)
|
|
4
6
|
|
|
5
7
|
```sh
|
|
@@ -23,7 +25,7 @@ For a new Vercel site, set `mode: new`, `creationApproved: true`, and its `proje
|
|
|
23
25
|
|
|
24
26
|
In GitHub Actions, secret commands require the configured repository on `main`. A desktop release may also use `arcnet env export --consumer desktop` on a version tag (`v<major>.<minor>.<patch>`); other consumers remain restricted to `main`.
|
|
25
27
|
|
|
26
|
-
|
|
28
|
+
The standing `CLOUDFLARE_API_TOKEN` should have Zone Read and DNS Write for all zones in the environment's Cloudflare account, including future zones. Then a new zone needs only a change to `.arcnet/arcnet.yaml` and a push; deployment checks zone access before Terraform or Vercel changes. Google Cloud Run domain mapping also requires base-domain ownership: `arcnet environment domain-owner` delegates an already verified domain to the deploy account. Declarative Vercel domain attachment and DNS reconciliation are supported; project domain add/remove CLI and full environment bootstrap/teardown remain unimplemented.
|
|
27
29
|
|
|
28
30
|
# ArcNet command reference
|
|
29
31
|
|
package/package.json
CHANGED
package/src/arcnetConfig.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { join } from "node:path";
|
|
|
3
3
|
import { parse } from "yaml";
|
|
4
4
|
import { z } from "zod";
|
|
5
5
|
import { deployBlockSchema } from "@mp-lb/zapper/dist/arc/schemas.js";
|
|
6
|
-
import { vercelInputSchema } from "./schemas.js";
|
|
6
|
+
import { accountSchema, vercelInputSchema } from "./schemas.js";
|
|
7
7
|
import { secretsConfigSchema, simpleSourceSchema } from "./secrets/config.js";
|
|
8
8
|
|
|
9
9
|
const slug = z
|
|
@@ -54,7 +54,10 @@ const arcnetConfigSchema = z
|
|
|
54
54
|
})
|
|
55
55
|
.strict()
|
|
56
56
|
.optional(),
|
|
57
|
-
vercel: vercelInputSchema
|
|
57
|
+
vercel: vercelInputSchema
|
|
58
|
+
.omit({ repository: true, account: true })
|
|
59
|
+
.extend({ account: accountSchema.optional() })
|
|
60
|
+
.optional(),
|
|
58
61
|
variables: z.union([inlineVariables, forumVariablesSchema]).optional(),
|
|
59
62
|
secrets: z
|
|
60
63
|
.object({
|
package/src/compileArcnet.ts
CHANGED
|
@@ -2,20 +2,48 @@ import { deployBlockSchema } from "@mp-lb/zapper/dist/arc/schemas.js";
|
|
|
2
2
|
import type { ArcnetConfig } from "./arcnetConfig.js";
|
|
3
3
|
import { resolveEnvironment } from "./resolveEnvironment.js";
|
|
4
4
|
import { validateConfig } from "./validateConfig.js";
|
|
5
|
+
import { readVariables } from "./variables.js";
|
|
5
6
|
|
|
6
7
|
export const arcnetMode = (config: ArcnetConfig) =>
|
|
7
|
-
config.vercel && config.services
|
|
8
|
+
config.vercel && config.services
|
|
9
|
+
? "mixed"
|
|
10
|
+
: config.vercel
|
|
11
|
+
? "vercel"
|
|
12
|
+
: config.services
|
|
13
|
+
? "terraform"
|
|
14
|
+
: "package";
|
|
8
15
|
|
|
9
16
|
export const compileVercel = (config: ArcnetConfig, root: string) => {
|
|
10
17
|
if (!config.vercel) throw new Error("No Vercel sites selected.");
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
18
|
+
|
|
19
|
+
const account =
|
|
20
|
+
config.vercel.account ??
|
|
21
|
+
(() => {
|
|
22
|
+
const id = readVariables(root, config).ARCNET_VERCEL_ACCOUNT_ID;
|
|
23
|
+
if (!id)
|
|
24
|
+
throw new Error(
|
|
25
|
+
"Vercel account missing. Add ARCNET_VERCEL_ACCOUNT_ID to the environment's standard variables, run arcnet variables sync, or set vercel.account in arcnet.yaml.",
|
|
26
|
+
);
|
|
27
|
+
return {
|
|
28
|
+
type: id.startsWith("team_")
|
|
29
|
+
? ("team" as const)
|
|
30
|
+
: ("personal" as const),
|
|
31
|
+
id,
|
|
32
|
+
};
|
|
33
|
+
})();
|
|
34
|
+
|
|
35
|
+
return validateConfig(
|
|
36
|
+
{
|
|
37
|
+
version: 1,
|
|
38
|
+
mode: "vercel",
|
|
39
|
+
slug: config.project,
|
|
40
|
+
repository: config.repository,
|
|
41
|
+
approved: config.approved,
|
|
42
|
+
...config.vercel,
|
|
43
|
+
account,
|
|
44
|
+
},
|
|
45
|
+
root,
|
|
46
|
+
);
|
|
19
47
|
};
|
|
20
48
|
|
|
21
49
|
export const compileTerraform = (config: ArcnetConfig) => {
|
|
@@ -50,6 +78,7 @@ export const compileTerraform = (config: ArcnetConfig) => {
|
|
|
50
78
|
]
|
|
51
79
|
.filter((domain): domain is string => Boolean(domain))
|
|
52
80
|
.map((domain) => `https://${domain}`);
|
|
81
|
+
|
|
53
82
|
for (const service of Object.values(services))
|
|
54
83
|
if (service.module === "aws-s3")
|
|
55
84
|
service.params["cors-origins"] ??= [...new Set(corsOrigins)].sort();
|
|
@@ -57,10 +86,12 @@ export const compileTerraform = (config: ArcnetConfig) => {
|
|
|
57
86
|
const infrastructure = deployBlockSchema.shape.project.parse(
|
|
58
87
|
config.infrastructure ?? {},
|
|
59
88
|
);
|
|
89
|
+
|
|
60
90
|
const modules = [
|
|
61
91
|
...Object.values(services),
|
|
62
92
|
...Object.values(infrastructure),
|
|
63
93
|
].map((resource) => resource.module);
|
|
94
|
+
|
|
64
95
|
const network = resolveEnvironment(config.environment, modules);
|
|
65
96
|
for (const service of Object.values(services))
|
|
66
97
|
if (service.module === "vercel-static")
|
package/src/createCli.ts
CHANGED
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
import { Command } from "commander";
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
appendFileSync,
|
|
4
|
+
existsSync,
|
|
5
|
+
readFileSync,
|
|
6
|
+
realpathSync,
|
|
7
|
+
} from "node:fs";
|
|
3
8
|
import { join } from "node:path";
|
|
4
9
|
import { z } from "zod";
|
|
5
10
|
import { ciOutputs } from "./ciOutputs.js";
|
|
6
11
|
import { grantDomainOwner } from "./environment/grantDomainOwner.js";
|
|
12
|
+
import { checkZoneAccess } from "./domains/checkZoneAccess.js";
|
|
7
13
|
import { createSetupCommand } from "./createSetupCommand.js";
|
|
8
14
|
import { packageVersion } from "./packageInfo.js";
|
|
9
15
|
import { renderResult } from "./renderResult.js";
|
|
@@ -122,6 +128,14 @@ export const createCli = () => {
|
|
|
122
128
|
command.action(async (site: unknown) => {
|
|
123
129
|
const root = realpathSync(cli.opts().root);
|
|
124
130
|
|
|
131
|
+
if (
|
|
132
|
+
!hasArcnetConfig(root) &&
|
|
133
|
+
!existsSync(join(root, ".arcnet/project.json"))
|
|
134
|
+
)
|
|
135
|
+
throw new Error(
|
|
136
|
+
"Project is not configured. Create .arcnet/arcnet.yaml and run arcnet setup <project-slug> first.",
|
|
137
|
+
);
|
|
138
|
+
|
|
125
139
|
const mode = hasArcnetConfig(root)
|
|
126
140
|
? arcnetMode(readArcnetConfig(root))
|
|
127
141
|
: z
|
|
@@ -135,6 +149,9 @@ export const createCli = () => {
|
|
|
135
149
|
const machine = Boolean(cli.opts().json || cli.opts().jsonl);
|
|
136
150
|
|
|
137
151
|
const execute = async () => {
|
|
152
|
+
if (name === "deploy" && hasArcnetConfig(root))
|
|
153
|
+
await checkZoneAccess(readArcnetConfig(root));
|
|
154
|
+
|
|
138
155
|
if (mode === "package") {
|
|
139
156
|
if (name === "check" || name === "plan")
|
|
140
157
|
return {
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import type { ArcnetConfig } from "../arcnetConfig.js";
|
|
2
|
+
import { requiredZones } from "./requiredZones.js";
|
|
3
|
+
|
|
4
|
+
type Zone = { id: string; name: string; status: string };
|
|
5
|
+
|
|
6
|
+
export const checkZoneAccess = async (
|
|
7
|
+
config: ArcnetConfig,
|
|
8
|
+
token = process.env.CLOUDFLARE_API_TOKEN,
|
|
9
|
+
request: typeof fetch = fetch,
|
|
10
|
+
) => {
|
|
11
|
+
const zones = requiredZones(config);
|
|
12
|
+
if (!zones.length) return { zones };
|
|
13
|
+
if (!token)
|
|
14
|
+
throw new Error("CLOUDFLARE_API_TOKEN is required for configured domains.");
|
|
15
|
+
|
|
16
|
+
for (const name of zones) {
|
|
17
|
+
const url = new URL("https://api.cloudflare.com/client/v4/zones");
|
|
18
|
+
url.searchParams.set("name", name);
|
|
19
|
+
|
|
20
|
+
const response = await request(url, {
|
|
21
|
+
headers: { Authorization: `Bearer ${token}` },
|
|
22
|
+
});
|
|
23
|
+
|
|
24
|
+
if (!response.ok)
|
|
25
|
+
throw new Error(
|
|
26
|
+
`ArcNet deployment token cannot inspect Cloudflare zone ${name} (${response.status}). Give the CI token Zone Read and DNS Write for all zones in the environment account.`,
|
|
27
|
+
);
|
|
28
|
+
|
|
29
|
+
const body = (await response.json()) as {
|
|
30
|
+
success?: boolean;
|
|
31
|
+
result?: Zone[];
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
if (
|
|
35
|
+
!body.success ||
|
|
36
|
+
!body.result?.some(
|
|
37
|
+
(zone) => zone.name === name && zone.status === "active",
|
|
38
|
+
)
|
|
39
|
+
)
|
|
40
|
+
throw new Error(
|
|
41
|
+
`ArcNet deployment token cannot access active Cloudflare zone ${name}. Give the CI token Zone Read and DNS Write for all zones in the environment account.`,
|
|
42
|
+
);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
return { zones };
|
|
46
|
+
};
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import type { ArcnetConfig } from "../arcnetConfig.js";
|
|
2
|
+
import { compileTerraform } from "../compileArcnet.js";
|
|
3
|
+
|
|
4
|
+
export const requiredZones = (config: ArcnetConfig) => {
|
|
5
|
+
const zones = new Set<string>();
|
|
6
|
+
|
|
7
|
+
if (config.services) {
|
|
8
|
+
const { deployment, network } = compileTerraform(config);
|
|
9
|
+
|
|
10
|
+
for (const service of Object.values(deployment.services)) {
|
|
11
|
+
if (
|
|
12
|
+
service.module !== "cloud-run-web" &&
|
|
13
|
+
service.module !== "vercel-static"
|
|
14
|
+
)
|
|
15
|
+
continue;
|
|
16
|
+
const zone = service["dns-zone"] ?? network.dns.zone;
|
|
17
|
+
if (
|
|
18
|
+
!service.domain ||
|
|
19
|
+
(service.domain !== zone && !service.domain.endsWith(`.${zone}`))
|
|
20
|
+
)
|
|
21
|
+
throw new Error(
|
|
22
|
+
`Domain ${service.domain ?? "(missing)"} is outside DNS zone ${zone}.`,
|
|
23
|
+
);
|
|
24
|
+
zones.add(zone);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
if (
|
|
29
|
+
config.vercel &&
|
|
30
|
+
Object.values(config.vercel.sites).some((site) => site.domain)
|
|
31
|
+
) {
|
|
32
|
+
if (!config.vercel.dnsZone)
|
|
33
|
+
throw new Error("Vercel custom domains require vercel.dnsZone.");
|
|
34
|
+
zones.add(config.vercel.dnsZone);
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
return [...zones].sort();
|
|
38
|
+
};
|
package/src/schemas.ts
CHANGED
|
@@ -6,7 +6,7 @@ const projectName = z
|
|
|
6
6
|
.refine((v) => !v.includes("---"))
|
|
7
7
|
.refine((v) => !/REPLACE/i.test(v));
|
|
8
8
|
|
|
9
|
-
const accountSchema = z
|
|
9
|
+
export const accountSchema = z
|
|
10
10
|
.object({
|
|
11
11
|
type: z.enum(["team", "personal"]),
|
|
12
12
|
id: z
|
|
@@ -29,7 +29,10 @@ const siteSchema = z
|
|
|
29
29
|
.refine((v) => !/REPLACE/i.test(v))
|
|
30
30
|
.optional(),
|
|
31
31
|
projectName,
|
|
32
|
-
domain: z
|
|
32
|
+
domain: z
|
|
33
|
+
.string()
|
|
34
|
+
.regex(/^[a-z0-9.-]+\.[a-z]{2,}$/)
|
|
35
|
+
.optional(),
|
|
33
36
|
root: z.string().optional(),
|
|
34
37
|
framework: z.enum(["static", "vercel"]).optional(),
|
|
35
38
|
creationApproved: z.boolean().optional(),
|
|
@@ -91,7 +94,10 @@ export const vercelInputSchema = z
|
|
|
91
94
|
.string()
|
|
92
95
|
.regex(/^[A-Za-z0-9][A-Za-z0-9-]*\/[A-Za-z0-9][A-Za-z0-9._-]*$/),
|
|
93
96
|
account: accountSchema,
|
|
94
|
-
dnsZone: z
|
|
97
|
+
dnsZone: z
|
|
98
|
+
.string()
|
|
99
|
+
.regex(/^[a-z0-9.-]+\.[a-z]{2,}$/)
|
|
100
|
+
.optional(),
|
|
95
101
|
sites: sitesSchema,
|
|
96
102
|
})
|
|
97
103
|
.strict();
|
|
@@ -106,7 +112,11 @@ export const vercelConfigSchema = vercelInputSchema
|
|
|
106
112
|
.superRefine((config, context) => {
|
|
107
113
|
for (const [name, site] of Object.entries(config.sites)) {
|
|
108
114
|
if (!site.domain) continue;
|
|
109
|
-
if (
|
|
115
|
+
if (
|
|
116
|
+
!config.dnsZone ||
|
|
117
|
+
(site.domain !== config.dnsZone &&
|
|
118
|
+
!site.domain.endsWith(`.${config.dnsZone}`))
|
|
119
|
+
)
|
|
110
120
|
context.addIssue({
|
|
111
121
|
code: "custom",
|
|
112
122
|
path: ["sites", name, "domain"],
|