@mp-lb/arcnet 0.7.16 → 0.7.18
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 +6 -0
- package/dist/createProject.d.ts +1 -1
- package/dist/createProject.d.ts.map +1 -1
- package/dist/createProject.js +6 -2
- package/dist/createProject.js.map +1 -1
- package/dist/deploy.d.ts.map +1 -1
- package/dist/deploy.js +17 -5
- package/dist/deploy.js.map +1 -1
- package/dist/readNodeVersion.d.ts +2 -0
- package/dist/readNodeVersion.d.ts.map +1 -0
- package/dist/readNodeVersion.js +11 -0
- package/dist/readNodeVersion.js.map +1 -0
- package/dist/resolveDeploymentProjects.d.ts +1 -1
- package/dist/resolveDeploymentProjects.d.ts.map +1 -1
- package/dist/resolveDeploymentProjects.js +10 -3
- package/dist/resolveDeploymentProjects.js.map +1 -1
- package/dist/runVercel.d.ts.map +1 -1
- package/dist/runVercel.js +1 -1
- package/dist/runVercel.js.map +1 -1
- package/dist/secrets/writeSecretsWorkflow.js +4 -4
- package/dist/secrets/writeSecretsWorkflow.js.map +1 -1
- package/docs/public/llms-full.txt +6 -0
- package/environments/mp-lb.yaml +1 -1
- package/package.json +1 -1
- package/src/createProject.ts +6 -1
- package/src/deploy.ts +37 -5
- package/src/readNodeVersion.ts +11 -0
- package/src/resolveDeploymentProjects.ts +39 -9
- package/src/runVercel.ts +2 -3
- package/src/secrets/writeSecretsWorkflow.ts +4 -4
- package/templates/deploy-arc.yaml +12 -11
- package/templates/deploy-mixed.yaml +12 -11
- package/templates/deploy-vercel.yaml +9 -8
- package/templates/network.yaml +1 -1
- package/templates/vercel-static/module.yaml +5 -4
package/README.md
CHANGED
|
@@ -43,3 +43,9 @@ that organization. Existing projects require a reviewed migration: inspect
|
|
|
43
43
|
inherited policies, keep project IDs and Terraform state locations unchanged,
|
|
44
44
|
and verify deployments after moving. Updating ArcNet can propose a project
|
|
45
45
|
parent change; review the plan before deployment.
|
|
46
|
+
|
|
47
|
+
## Setup guarantees
|
|
48
|
+
|
|
49
|
+
Generated deployment workflows validate workspace lint, types, tests and builds before deployment. Their Actions runtimes are independent of the application's Node pin. New Vercel projects receive the Node major from the exact root `.node-version`; inspect existing provider settings separately when adopting an existing project. Vercel CLI authentication stays in `VERCEL_TOKEN`, never subprocess arguments.
|
|
50
|
+
|
|
51
|
+
The MAP Lab CI defaults do not grant billing-management access unless explicitly selected for a capability that requires it. Cloud Run custom-domain ownership delegation remains an operator prerequisite before applying the mapping.
|
package/dist/createProject.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { VercelConfig, VercelRequest } from "./schemas.js";
|
|
2
|
-
export declare const createProject: (config: VercelConfig, name: string, request: VercelRequest) => Promise<{
|
|
2
|
+
export declare const createProject: (config: VercelConfig, name: string, request: VercelRequest, root?: string) => Promise<{
|
|
3
3
|
repository: string;
|
|
4
4
|
account: {
|
|
5
5
|
type: "team" | "personal";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createProject.d.ts","sourceRoot":"","sources":["../src/createProject.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createProject.d.ts","sourceRoot":"","sources":["../src/createProject.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAEhE,eAAO,MAAM,aAAa,GACxB,QAAQ,YAAY,EACpB,MAAM,MAAM,EACZ,SAAS,aAAa,EACtB,aAAoB;;;;;;;;;;;;;;;;;;;;;;;;;EAuDrB,CAAC"}
|
package/dist/createProject.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import { readNodeVersion } from "./readNodeVersion.js";
|
|
1
2
|
import { checkIdentity } from "./checkIdentity.js";
|
|
2
3
|
import { fail } from "./fail.js";
|
|
3
|
-
export const createProject = async (config, name, request) => {
|
|
4
|
+
export const createProject = async (config, name, request, root = process.cwd()) => {
|
|
4
5
|
const site = config.sites[name];
|
|
5
6
|
if (!site)
|
|
6
7
|
fail("Choose a configured site.");
|
|
@@ -17,8 +18,11 @@ export const createProject = async (config, name, request) => {
|
|
|
17
18
|
fail(`Project name ${site.projectName} already exists. Set an explicit existing reference after verifying its ID; no duplicate project was created.`);
|
|
18
19
|
const created = await request("POST", "/v11/projects", config.account, {
|
|
19
20
|
name: site.projectName,
|
|
21
|
+
nodeVersion: readNodeVersion(root),
|
|
20
22
|
framework: site.framework === "vercel" ? "nextjs" : null,
|
|
21
|
-
...(site.framework === "vercel" && site.root !== "."
|
|
23
|
+
...(site.framework === "vercel" && site.root !== "."
|
|
24
|
+
? { rootDirectory: site.root }
|
|
25
|
+
: {}),
|
|
22
26
|
});
|
|
23
27
|
if (!created ||
|
|
24
28
|
!/^prj_[A-Za-z0-9]+$/.test(created.id ?? "") ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createProject.js","sourceRoot":"","sources":["../src/createProject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,MAAoB,EACpB,IAAY,EACZ,OAAsB,EACtB,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,CAAC,IAAI;QAAE,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAE7C,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC7B,aAAa,CACX,MAAM,OAAO,CAAC,KAAK,EAAE,gBAAgB,IAAI,CAAC,SAAS,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,EACtE,IAAI,EACJ,MAAM,CAAC,OAAO,CACf,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QACvC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC7D,IAAI,GAAG,EAAE,IAAI,EAAE,EAAE,KAAK,MAAM,CAAC,OAAO,CAAC,EAAE;YACrC,IAAI,CACF,+EAA+E,CAChF,CAAC;IACN,CAAC;IAED,IACE,MAAM,OAAO,CACX,KAAK,EACL,gBAAgB,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,EACtD,MAAM,CAAC,OAAO,CACf;QAED,IAAI,CACF,gBAAgB,IAAI,CAAC,WAAW,+GAA+G,CAChJ,CAAC;IAEJ,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,MAAM,CAAC,OAAO,EAAE;QACrE,IAAI,EAAE,IAAI,CAAC,WAAW;QACtB,SAAS,EAAE,IAAI,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;QACxD,GAAG,CAAC,IAAI,CAAC,SAAS,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"createProject.js","sourceRoot":"","sources":["../src/createProject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,MAAoB,EACpB,IAAY,EACZ,OAAsB,EACtB,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,EACpB,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,CAAC,IAAI;QAAE,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAE7C,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC7B,aAAa,CACX,MAAM,OAAO,CAAC,KAAK,EAAE,gBAAgB,IAAI,CAAC,SAAS,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,EACtE,IAAI,EACJ,MAAM,CAAC,OAAO,CACf,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QACvC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC7D,IAAI,GAAG,EAAE,IAAI,EAAE,EAAE,KAAK,MAAM,CAAC,OAAO,CAAC,EAAE;YACrC,IAAI,CACF,+EAA+E,CAChF,CAAC;IACN,CAAC;IAED,IACE,MAAM,OAAO,CACX,KAAK,EACL,gBAAgB,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,EACtD,MAAM,CAAC,OAAO,CACf;QAED,IAAI,CACF,gBAAgB,IAAI,CAAC,WAAW,+GAA+G,CAChJ,CAAC;IAEJ,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,MAAM,CAAC,OAAO,EAAE;QACrE,IAAI,EAAE,IAAI,CAAC,WAAW;QACtB,WAAW,EAAE,eAAe,CAAC,IAAI,CAAC;QAClC,SAAS,EAAE,IAAI,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;QACxD,GAAG,CAAC,IAAI,CAAC,SAAS,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,KAAK,GAAG;YAClD,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,IAAI,EAAE;YAC9B,CAAC,CAAC,EAAE,CAAC;KACR,CAAC,CAAC;IAEH,IACE,CAAC,OAAO;QACR,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC;QAC5C,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,OAAO,CAAC,EAAE;QACvC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,WAAW;QAEjC,IAAI,CACF,2EAA2E,CAC5E,CAAC;IACJ,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC,EAAG,EAAE,CAAC;IACzE,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
|
package/dist/deploy.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../src/deploy.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,UAAU,EACV,YAAY,EACZ,aAAa,EAEd,MAAM,cAAc,CAAC;AAKtB,eAAO,MAAM,MAAM,GACjB,QAAQ,YAAY,EACpB,MAAM,MAAM,EACZ,SAAS,aAAa,EACtB,KAAK,UAAU,EACf,aAAa,MAAM,CAAC,UAAU,EAC9B,eAAqB,
|
|
1
|
+
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../src/deploy.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,UAAU,EACV,YAAY,EACZ,aAAa,EAEd,MAAM,cAAc,CAAC;AAKtB,eAAO,MAAM,MAAM,GACjB,QAAQ,YAAY,EACpB,MAAM,MAAM,EACZ,SAAS,aAAa,EACtB,KAAK,UAAU,EACf,aAAa,MAAM,CAAC,UAAU,EAC9B,eAAqB,kBA4FtB,CAAC"}
|
package/dist/deploy.js
CHANGED
|
@@ -12,7 +12,7 @@ export const deploy = async (config, root, request, run, environment, target = "
|
|
|
12
12
|
(environment.GITHUB_REPOSITORY !== config.repository ||
|
|
13
13
|
environment.GITHUB_REF !== "refs/heads/main"))
|
|
14
14
|
fail("CI deployment is restricted to the configured repository main branch.");
|
|
15
|
-
config = await resolveDeploymentProjects(config, request, target === "production");
|
|
15
|
+
config = await resolveDeploymentProjects(config, request, target === "production", root);
|
|
16
16
|
if (target === "production")
|
|
17
17
|
await syncDomains(config, request, environment);
|
|
18
18
|
const stages = [];
|
|
@@ -34,8 +34,22 @@ export const deploy = async (config, root, request, run, environment, target = "
|
|
|
34
34
|
};
|
|
35
35
|
if (site.framework === "vercel") {
|
|
36
36
|
const cli = ["--yes", "vercel@63.1.2"];
|
|
37
|
-
await run("npx", [
|
|
38
|
-
|
|
37
|
+
await run("npx", [
|
|
38
|
+
...cli,
|
|
39
|
+
"pull",
|
|
40
|
+
"--project",
|
|
41
|
+
site.projectId,
|
|
42
|
+
"--yes",
|
|
43
|
+
`--environment=${target}`,
|
|
44
|
+
], root, siteEnv);
|
|
45
|
+
await run("npx", [
|
|
46
|
+
...cli,
|
|
47
|
+
"build",
|
|
48
|
+
"--project",
|
|
49
|
+
site.projectId,
|
|
50
|
+
...(target === "production" ? ["--prod"] : []),
|
|
51
|
+
"--yes",
|
|
52
|
+
], root, siteEnv);
|
|
39
53
|
}
|
|
40
54
|
const args = [
|
|
41
55
|
"--yes",
|
|
@@ -45,8 +59,6 @@ export const deploy = async (config, root, request, run, environment, target = "
|
|
|
45
59
|
...(site.framework === "vercel" ? ["--project", site.projectId] : []),
|
|
46
60
|
"--yes",
|
|
47
61
|
...(target === "production" ? ["--prod"] : []),
|
|
48
|
-
"--token",
|
|
49
|
-
environment.VERCEL_TOKEN,
|
|
50
62
|
];
|
|
51
63
|
await run("npx", args, stage ?? root, siteEnv);
|
|
52
64
|
}
|
package/dist/deploy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../src/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAO3E,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,EACzB,MAAoB,EACpB,IAAY,EACZ,OAAsB,EACtB,GAAe,EACf,WAA8B,EAC9B,MAAM,GAAG,YAAY,EACrB,EAAE;IACF,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC7B,IAAI,CAAC,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC7C,IAAI,CAAC,uCAAuC,CAAC,CAAC;IAChD,IACE,WAAW,CAAC,cAAc,KAAK,MAAM;QACrC,CAAC,WAAW,CAAC,iBAAiB,KAAK,MAAM,CAAC,UAAU;YAClD,WAAW,CAAC,UAAU,KAAK,iBAAiB,CAAC;QAE/C,IAAI,CACF,uEAAuE,CACxE,CAAC;IACJ,MAAM,GAAG,MAAM,yBAAyB,
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../src/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"readNodeVersion.d.ts","sourceRoot":"","sources":["../src/readNodeVersion.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,KAAG,MAM9C,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { readFileSync } from "node:fs";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import { fail } from "./fail.js";
|
|
4
|
+
export const readNodeVersion = (root) => {
|
|
5
|
+
const pin = readFileSync(join(root, ".node-version"), "utf8").trim();
|
|
6
|
+
const match = /^v?(\d+)\.\d+\.\d+$/.exec(pin);
|
|
7
|
+
if (!match)
|
|
8
|
+
fail("Vercel creation requires an exact Node version in .node-version.");
|
|
9
|
+
return `${match[1]}.x`;
|
|
10
|
+
};
|
|
11
|
+
//# sourceMappingURL=readNodeVersion.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"readNodeVersion.js","sourceRoot":"","sources":["../src/readNodeVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAU,EAAE;IACtD,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IACrE,MAAM,KAAK,GAAG,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9C,IAAI,CAAC,KAAK;QACR,IAAI,CAAC,kEAAkE,CAAC,CAAC;IAC3E,OAAO,GAAG,KAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1B,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { VercelConfig, VercelRequest, VercelResponse, VercelSite } from "./schemas.js";
|
|
2
2
|
export declare const checkNamedProject: (project: VercelResponse, site: VercelSite, accountId: string) => string;
|
|
3
|
-
export declare const resolveDeploymentProjects: (config: VercelConfig, request: VercelRequest, allowCreate?: boolean) => Promise<VercelConfig>;
|
|
3
|
+
export declare const resolveDeploymentProjects: (config: VercelConfig, request: VercelRequest, allowCreate?: boolean, root?: string) => Promise<VercelConfig>;
|
|
4
4
|
//# sourceMappingURL=resolveDeploymentProjects.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveDeploymentProjects.d.ts","sourceRoot":"","sources":["../src/resolveDeploymentProjects.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolveDeploymentProjects.d.ts","sourceRoot":"","sources":["../src/resolveDeploymentProjects.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,cAAc,EACd,UAAU,EACX,MAAM,cAAc,CAAC;AAEtB,eAAO,MAAM,iBAAiB,GAC5B,SAAS,cAAc,EACvB,MAAM,UAAU,EAChB,WAAW,MAAM,WAkBlB,CAAC;AAEF,eAAO,MAAM,yBAAyB,GACpC,QAAQ,YAAY,EACpB,SAAS,aAAa,EACtB,qBAAkB,EAClB,aAAoB,KACnB,OAAO,CAAC,YAAY,CAqEtB,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { readNodeVersion } from "./readNodeVersion.js";
|
|
1
2
|
import { checkIdentity } from "./checkIdentity.js";
|
|
2
3
|
import { fail } from "./fail.js";
|
|
3
4
|
export const checkNamedProject = (project, site, accountId) => {
|
|
@@ -5,13 +6,16 @@ export const checkNamedProject = (project, site, accountId) => {
|
|
|
5
6
|
project.name !== site.projectName ||
|
|
6
7
|
project.accountId !== accountId ||
|
|
7
8
|
(project.rootDirectory !== undefined &&
|
|
8
|
-
project.rootDirectory !==
|
|
9
|
+
project.rootDirectory !==
|
|
10
|
+
(site.framework === "vercel" && site.root !== "."
|
|
11
|
+
? site.root
|
|
12
|
+
: null)) ||
|
|
9
13
|
(project.framework !== undefined &&
|
|
10
14
|
project.framework !== (site.framework === "vercel" ? "nextjs" : null)))
|
|
11
15
|
fail(`Project identity/settings mismatch for ${site.projectName}. No deployment attempted.`);
|
|
12
16
|
return project.id;
|
|
13
17
|
};
|
|
14
|
-
export const resolveDeploymentProjects = async (config, request, allowCreate = true) => {
|
|
18
|
+
export const resolveDeploymentProjects = async (config, request, allowCreate = true, root = process.cwd()) => {
|
|
15
19
|
const resolved = structuredClone(config);
|
|
16
20
|
const missing = [];
|
|
17
21
|
// Check every selected project before creating or deploying any of them.
|
|
@@ -39,8 +43,11 @@ export const resolveDeploymentProjects = async (config, request, allowCreate = t
|
|
|
39
43
|
const site = config.sites[name];
|
|
40
44
|
const created = await request("POST", "/v11/projects", config.account, {
|
|
41
45
|
name: site.projectName,
|
|
46
|
+
nodeVersion: readNodeVersion(root),
|
|
42
47
|
framework: site.framework === "vercel" ? "nextjs" : null,
|
|
43
|
-
...(site.framework === "vercel" && site.root !== "."
|
|
48
|
+
...(site.framework === "vercel" && site.root !== "."
|
|
49
|
+
? { rootDirectory: site.root }
|
|
50
|
+
: {}),
|
|
44
51
|
});
|
|
45
52
|
if (!created)
|
|
46
53
|
fail(`Vercel returned no project for ${site.projectName}.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveDeploymentProjects.js","sourceRoot":"","sources":["../src/resolveDeploymentProjects.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"resolveDeploymentProjects.js","sourceRoot":"","sources":["../src/resolveDeploymentProjects.ts"],"names":[],"mappings":"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"}
|
package/dist/runVercel.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runVercel.d.ts","sourceRoot":"","sources":["../src/runVercel.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,SAAS,GACpB,SAAS,MAAM,EACf,MAAM,MAAM,EACZ,WAAW,MAAM,EACjB,iBAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"runVercel.d.ts","sourceRoot":"","sources":["../src/runVercel.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,SAAS,GACpB,SAAS,MAAM,EACf,MAAM,MAAM,EACZ,WAAW,MAAM,EACjB,iBAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4FhB,CAAC"}
|
package/dist/runVercel.js
CHANGED
|
@@ -38,7 +38,7 @@ export const runVercel = async (command, root, argument, machine = false) => {
|
|
|
38
38
|
if (command === "create") {
|
|
39
39
|
if (!argument)
|
|
40
40
|
throw new Error("Choose a configured site.");
|
|
41
|
-
const next = await createProject(config, argument, request);
|
|
41
|
+
const next = await createProject(config, argument, request, root);
|
|
42
42
|
if (next === config)
|
|
43
43
|
return {
|
|
44
44
|
operation: command,
|
package/dist/runVercel.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runVercel.js","sourceRoot":"","sources":["../src/runVercel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAC5B,OAAe,EACf,IAAY,EACZ,QAAiB,EACjB,OAAO,GAAG,KAAK,EACf,EAAE;IACF,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE1E,MAAM,IAAI,GAAG,MAAM;QACjB,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC;QACxB,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;IAEvC,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE5C,MAAM,MAAM,GAAG,cAAc,CAC3B,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAC3D,IAAI,CACL,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE5D,IAAI,OAAO,KAAK,OAAO,IAAI,OAAO,KAAK,MAAM;QAC3C,OAAO,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClC,IAAI,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,MAAM;QAC/D,MAAM,IAAI,KAAK,CACb,6EAA6E,CAC9E,CAAC;IACJ,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAEpD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACzD,OAAO;YACL,SAAS,EAAE,OAAO;YAClB,OAAO;YACP,OAAO,EAAE,OAAO,CAAC,MAAM;gBACrB,CAAC,CAAC,sCAAsC,OAAO,CAAC,MAAM,sFAAsF;gBAC5I,CAAC,CAAC,8EAA8E;SACnF,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;QACzB,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC5D,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"runVercel.js","sourceRoot":"","sources":["../src/runVercel.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,16 +39,16 @@ export const writeSecretsWorkflow = (config, root, configFile) => {
|
|
|
39
39
|
jobs: {
|
|
40
40
|
validate: {
|
|
41
41
|
if: `github.repository == '${config.repository}' && github.ref == 'refs/heads/main'`,
|
|
42
|
-
"runs-on": "ubuntu-
|
|
42
|
+
"runs-on": "blacksmith-4vcpu-ubuntu-2404",
|
|
43
43
|
"timeout-minutes": 10,
|
|
44
44
|
steps: [
|
|
45
45
|
{
|
|
46
|
-
uses: "actions/checkout@
|
|
46
|
+
uses: "actions/checkout@v5",
|
|
47
47
|
with: { "persist-credentials": false },
|
|
48
48
|
},
|
|
49
|
-
{ uses: "pnpm/action-setup@
|
|
49
|
+
{ uses: "pnpm/action-setup@v5" },
|
|
50
50
|
{
|
|
51
|
-
uses: "actions/setup-node@
|
|
51
|
+
uses: "actions/setup-node@v5",
|
|
52
52
|
with: existsSync(safeTargetPath(root, ".node-version"))
|
|
53
53
|
? { "node-version-file": ".node-version" }
|
|
54
54
|
: { "node-version": 22 },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writeSecretsWorkflow.js","sourceRoot":"","sources":["../../src/secrets/writeSecretsWorkflow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,MAAqB,EACrB,IAAY,EACZ,UAAkB,EAClB,EAAE;IACF,MAAM,IAAI,GAAG,cAAc,CACzB,IAAI,EACJ,gDAAgD,CACjD,CAAC;IAEF,MAAM,MAAM,GAAG,uDAAuD,UAAU,KAAK,CAAC;IAEtF,IACE,UAAU,CAAC,IAAI,CAAC;QAChB,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,UAAU,CAAC,gCAAgC,CAAC;QAExE,MAAM,IAAI,KAAK,CACb,yFAAyF,CAC1F,CAAC;IACJ,IAAI,CAAC,CAAC,sBAAsB,EAAE,qBAAqB,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;QACvE,MAAM,IAAI,KAAK,CACb,+DAA+D,CAChE,CAAC;IACJ,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE9C,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAC5B,MAAM,CAAC,OAAO;SACX,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;QACnB,MAAM,CAAC,MAAM;QACb,GAAG,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAClE,CAAC;SACD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,oBAAoB,GAAG,KAAK,CAAC,CAAC,CACrD,CAAC;IAEF,aAAa,CACX,IAAI,EACJ,MAAM;QACJ,SAAS,CAAC;YACR,IAAI,EAAE,yBAAyB;YAC/B,EAAE,EAAE;gBACF,iBAAiB,EAAE,EAAE;gBACrB,IAAI,EAAE;oBACJ,QAAQ,EAAE,CAAC,MAAM,CAAC;oBAClB,KAAK,EAAE;wBACL,YAAY;wBACZ,gDAAgD;wBAChD,cAAc;wBACd,eAAe;wBACf,qBAAqB;wBACrB,gBAAgB;qBACjB;iBACF;aACF;YACD,WAAW,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE;YACjC,IAAI,EAAE;gBACJ,QAAQ,EAAE;oBACR,EAAE,EAAE,yBAAyB,MAAM,CAAC,UAAU,sCAAsC;oBACpF,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"writeSecretsWorkflow.js","sourceRoot":"","sources":["../../src/secrets/writeSecretsWorkflow.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,6 +44,12 @@ inherited policies, keep project IDs and Terraform state locations unchanged,
|
|
|
44
44
|
and verify deployments after moving. Updating ArcNet can propose a project
|
|
45
45
|
parent change; review the plan before deployment.
|
|
46
46
|
|
|
47
|
+
## Setup guarantees
|
|
48
|
+
|
|
49
|
+
Generated deployment workflows validate workspace lint, types, tests and builds before deployment. Their Actions runtimes are independent of the application's Node pin. New Vercel projects receive the Node major from the exact root `.node-version`; inspect existing provider settings separately when adopting an existing project. Vercel CLI authentication stays in `VERCEL_TOKEN`, never subprocess arguments.
|
|
50
|
+
|
|
51
|
+
The MAP Lab CI defaults do not grant billing-management access unless explicitly selected for a capability that requires it. Cloud Run custom-domain ownership delegation remains an operator prerequisite before applying the mapping.
|
|
52
|
+
|
|
47
53
|
# ArcNet command reference
|
|
48
54
|
|
|
49
55
|
Generated from the CLI command tree.
|
package/environments/mp-lb.yaml
CHANGED
|
@@ -61,7 +61,7 @@ module-defaults:
|
|
|
61
61
|
# The project CI identity cannot manage IAM on the platform project.
|
|
62
62
|
# Environment bootstrap grants quota-project access outside project Terraform.
|
|
63
63
|
network-project: ""
|
|
64
|
-
billing-account: "
|
|
64
|
+
billing-account: "" # Billing management belongs only to the budget capability.
|
|
65
65
|
gcp-project:
|
|
66
66
|
organization-id: "{gcp-organization}"
|
|
67
67
|
project-id: "{gcp-project}"
|
package/package.json
CHANGED
package/src/createProject.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { readNodeVersion } from "./readNodeVersion.js";
|
|
1
2
|
import { checkIdentity } from "./checkIdentity.js";
|
|
2
3
|
import { fail } from "./fail.js";
|
|
3
4
|
import type { VercelConfig, VercelRequest } from "./schemas.js";
|
|
@@ -6,6 +7,7 @@ export const createProject = async (
|
|
|
6
7
|
config: VercelConfig,
|
|
7
8
|
name: string,
|
|
8
9
|
request: VercelRequest,
|
|
10
|
+
root = process.cwd(),
|
|
9
11
|
) => {
|
|
10
12
|
const site = config.sites[name];
|
|
11
13
|
if (!site) fail("Choose a configured site.");
|
|
@@ -41,8 +43,11 @@ export const createProject = async (
|
|
|
41
43
|
|
|
42
44
|
const created = await request("POST", "/v11/projects", config.account, {
|
|
43
45
|
name: site.projectName,
|
|
46
|
+
nodeVersion: readNodeVersion(root),
|
|
44
47
|
framework: site.framework === "vercel" ? "nextjs" : null,
|
|
45
|
-
...(site.framework === "vercel" && site.root !== "."
|
|
48
|
+
...(site.framework === "vercel" && site.root !== "."
|
|
49
|
+
? { rootDirectory: site.root }
|
|
50
|
+
: {}),
|
|
46
51
|
});
|
|
47
52
|
|
|
48
53
|
if (
|
package/src/deploy.ts
CHANGED
|
@@ -30,7 +30,13 @@ export const deploy = async (
|
|
|
30
30
|
fail(
|
|
31
31
|
"CI deployment is restricted to the configured repository main branch.",
|
|
32
32
|
);
|
|
33
|
-
config = await resolveDeploymentProjects(
|
|
33
|
+
config = await resolveDeploymentProjects(
|
|
34
|
+
config,
|
|
35
|
+
request,
|
|
36
|
+
target === "production",
|
|
37
|
+
root,
|
|
38
|
+
);
|
|
39
|
+
|
|
34
40
|
if (target === "production") await syncDomains(config, request, environment);
|
|
35
41
|
const stages: Array<[VercelSite, string | null]> = [];
|
|
36
42
|
|
|
@@ -40,6 +46,7 @@ export const deploy = async (
|
|
|
40
46
|
stages.push([site, null]);
|
|
41
47
|
continue;
|
|
42
48
|
}
|
|
49
|
+
|
|
43
50
|
const buildEnv = Object.fromEntries(
|
|
44
51
|
Object.entries(environment).filter(([k]) => !k.startsWith("VERCEL_")),
|
|
45
52
|
);
|
|
@@ -54,11 +61,38 @@ export const deploy = async (
|
|
|
54
61
|
VERCEL_PROJECT_ID: site.projectId,
|
|
55
62
|
VERCEL_ORG_ID: config.account.id,
|
|
56
63
|
};
|
|
64
|
+
|
|
57
65
|
if (site.framework === "vercel") {
|
|
58
66
|
const cli = ["--yes", "vercel@63.1.2"];
|
|
59
|
-
await run(
|
|
60
|
-
|
|
67
|
+
await run(
|
|
68
|
+
"npx",
|
|
69
|
+
[
|
|
70
|
+
...cli,
|
|
71
|
+
"pull",
|
|
72
|
+
"--project",
|
|
73
|
+
site.projectId!,
|
|
74
|
+
"--yes",
|
|
75
|
+
`--environment=${target}`,
|
|
76
|
+
],
|
|
77
|
+
root,
|
|
78
|
+
siteEnv,
|
|
79
|
+
);
|
|
80
|
+
|
|
81
|
+
await run(
|
|
82
|
+
"npx",
|
|
83
|
+
[
|
|
84
|
+
...cli,
|
|
85
|
+
"build",
|
|
86
|
+
"--project",
|
|
87
|
+
site.projectId!,
|
|
88
|
+
...(target === "production" ? ["--prod"] : []),
|
|
89
|
+
"--yes",
|
|
90
|
+
],
|
|
91
|
+
root,
|
|
92
|
+
siteEnv,
|
|
93
|
+
);
|
|
61
94
|
}
|
|
95
|
+
|
|
62
96
|
const args = [
|
|
63
97
|
"--yes",
|
|
64
98
|
"vercel@63.1.2",
|
|
@@ -67,8 +101,6 @@ export const deploy = async (
|
|
|
67
101
|
...(site.framework === "vercel" ? ["--project", site.projectId!] : []),
|
|
68
102
|
"--yes",
|
|
69
103
|
...(target === "production" ? ["--prod"] : []),
|
|
70
|
-
"--token",
|
|
71
|
-
environment.VERCEL_TOKEN!,
|
|
72
104
|
];
|
|
73
105
|
|
|
74
106
|
await run("npx", args, stage ?? root, siteEnv);
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { readFileSync } from "node:fs";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import { fail } from "./fail.js";
|
|
4
|
+
|
|
5
|
+
export const readNodeVersion = (root: string): string => {
|
|
6
|
+
const pin = readFileSync(join(root, ".node-version"), "utf8").trim();
|
|
7
|
+
const match = /^v?(\d+)\.\d+\.\d+$/.exec(pin);
|
|
8
|
+
if (!match)
|
|
9
|
+
fail("Vercel creation requires an exact Node version in .node-version.");
|
|
10
|
+
return `${match![1]}.x`;
|
|
11
|
+
};
|
|
@@ -1,6 +1,12 @@
|
|
|
1
|
+
import { readNodeVersion } from "./readNodeVersion.js";
|
|
1
2
|
import { checkIdentity } from "./checkIdentity.js";
|
|
2
3
|
import { fail } from "./fail.js";
|
|
3
|
-
import type {
|
|
4
|
+
import type {
|
|
5
|
+
VercelConfig,
|
|
6
|
+
VercelRequest,
|
|
7
|
+
VercelResponse,
|
|
8
|
+
VercelSite,
|
|
9
|
+
} from "./schemas.js";
|
|
4
10
|
|
|
5
11
|
export const checkNamedProject = (
|
|
6
12
|
project: VercelResponse,
|
|
@@ -12,11 +18,16 @@ export const checkNamedProject = (
|
|
|
12
18
|
project.name !== site.projectName ||
|
|
13
19
|
project.accountId !== accountId ||
|
|
14
20
|
(project.rootDirectory !== undefined &&
|
|
15
|
-
project.rootDirectory !==
|
|
21
|
+
project.rootDirectory !==
|
|
22
|
+
(site.framework === "vercel" && site.root !== "."
|
|
23
|
+
? site.root
|
|
24
|
+
: null)) ||
|
|
16
25
|
(project.framework !== undefined &&
|
|
17
26
|
project.framework !== (site.framework === "vercel" ? "nextjs" : null))
|
|
18
27
|
)
|
|
19
|
-
fail(
|
|
28
|
+
fail(
|
|
29
|
+
`Project identity/settings mismatch for ${site.projectName}. No deployment attempted.`,
|
|
30
|
+
);
|
|
20
31
|
return project.id!;
|
|
21
32
|
};
|
|
22
33
|
|
|
@@ -24,6 +35,7 @@ export const resolveDeploymentProjects = async (
|
|
|
24
35
|
config: VercelConfig,
|
|
25
36
|
request: VercelRequest,
|
|
26
37
|
allowCreate = true,
|
|
38
|
+
root = process.cwd(),
|
|
27
39
|
): Promise<VercelConfig> => {
|
|
28
40
|
const resolved = structuredClone(config);
|
|
29
41
|
const missing: string[] = [];
|
|
@@ -36,15 +48,22 @@ export const resolveDeploymentProjects = async (
|
|
|
36
48
|
site,
|
|
37
49
|
config.account,
|
|
38
50
|
);
|
|
51
|
+
|
|
39
52
|
continue;
|
|
40
53
|
}
|
|
54
|
+
|
|
41
55
|
const project = await request(
|
|
42
56
|
"GET",
|
|
43
57
|
`/v9/projects/${encodeURIComponent(site.projectName)}`,
|
|
44
58
|
config.account,
|
|
45
59
|
);
|
|
60
|
+
|
|
46
61
|
if (project) {
|
|
47
|
-
resolved.sites[name]!.projectId = checkNamedProject(
|
|
62
|
+
resolved.sites[name]!.projectId = checkNamedProject(
|
|
63
|
+
project,
|
|
64
|
+
site,
|
|
65
|
+
config.account.id,
|
|
66
|
+
);
|
|
48
67
|
} else {
|
|
49
68
|
missing.push(name);
|
|
50
69
|
}
|
|
@@ -56,23 +75,34 @@ export const resolveDeploymentProjects = async (
|
|
|
56
75
|
if (missing.length && config.account.type === "personal") {
|
|
57
76
|
const who = await request("GET", "/v2/user", config.account);
|
|
58
77
|
if (who?.user?.id !== config.account.id)
|
|
59
|
-
fail(
|
|
78
|
+
fail(
|
|
79
|
+
"Token personal account does not match configured account; no project created.",
|
|
80
|
+
);
|
|
60
81
|
}
|
|
61
82
|
|
|
62
83
|
for (const name of missing) {
|
|
63
84
|
const site = config.sites[name]!;
|
|
85
|
+
|
|
64
86
|
const created = await request("POST", "/v11/projects", config.account, {
|
|
65
87
|
name: site.projectName,
|
|
88
|
+
nodeVersion: readNodeVersion(root),
|
|
66
89
|
framework: site.framework === "vercel" ? "nextjs" : null,
|
|
67
|
-
...(site.framework === "vercel" && site.root !== "."
|
|
90
|
+
...(site.framework === "vercel" && site.root !== "."
|
|
91
|
+
? { rootDirectory: site.root }
|
|
92
|
+
: {}),
|
|
68
93
|
});
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
resolved.sites[name]!.projectId = checkNamedProject(
|
|
94
|
+
|
|
95
|
+
if (!created) fail(`Vercel returned no project for ${site.projectName}.`);
|
|
96
|
+
resolved.sites[name]!.projectId = checkNamedProject(
|
|
97
|
+
created,
|
|
98
|
+
site,
|
|
99
|
+
config.account.id,
|
|
100
|
+
);
|
|
72
101
|
}
|
|
73
102
|
|
|
74
103
|
for (const site of Object.values(resolved.sites)) {
|
|
75
104
|
site.mode = "existing";
|
|
76
105
|
}
|
|
106
|
+
|
|
77
107
|
return resolved;
|
|
78
108
|
};
|
package/src/runVercel.ts
CHANGED
|
@@ -59,7 +59,7 @@ export const runVercel = async (
|
|
|
59
59
|
|
|
60
60
|
if (command === "create") {
|
|
61
61
|
if (!argument) throw new Error("Choose a configured site.");
|
|
62
|
-
const next = await createProject(config, argument, request);
|
|
62
|
+
const next = await createProject(config, argument, request, root);
|
|
63
63
|
if (next === config)
|
|
64
64
|
return {
|
|
65
65
|
operation: command,
|
|
@@ -96,8 +96,7 @@ export const runVercel = async (
|
|
|
96
96
|
return {
|
|
97
97
|
operation: command,
|
|
98
98
|
projectId: next.sites[argument]!.projectId,
|
|
99
|
-
message:
|
|
100
|
-
"Created project; review and commit project.json before CI.",
|
|
99
|
+
message: "Created project; review and commit project.json before CI.",
|
|
101
100
|
};
|
|
102
101
|
}
|
|
103
102
|
|
|
@@ -62,16 +62,16 @@ export const writeSecretsWorkflow = (
|
|
|
62
62
|
jobs: {
|
|
63
63
|
validate: {
|
|
64
64
|
if: `github.repository == '${config.repository}' && github.ref == 'refs/heads/main'`,
|
|
65
|
-
"runs-on": "ubuntu-
|
|
65
|
+
"runs-on": "blacksmith-4vcpu-ubuntu-2404",
|
|
66
66
|
"timeout-minutes": 10,
|
|
67
67
|
steps: [
|
|
68
68
|
{
|
|
69
|
-
uses: "actions/checkout@
|
|
69
|
+
uses: "actions/checkout@v5",
|
|
70
70
|
with: { "persist-credentials": false },
|
|
71
71
|
},
|
|
72
|
-
{ uses: "pnpm/action-setup@
|
|
72
|
+
{ uses: "pnpm/action-setup@v5" },
|
|
73
73
|
{
|
|
74
|
-
uses: "actions/setup-node@
|
|
74
|
+
uses: "actions/setup-node@v5",
|
|
75
75
|
with: existsSync(safeTargetPath(root, ".node-version"))
|
|
76
76
|
? { "node-version-file": ".node-version" }
|
|
77
77
|
: { "node-version": 22 },
|
|
@@ -10,20 +10,21 @@ concurrency:
|
|
|
10
10
|
cancel-in-progress: false
|
|
11
11
|
jobs:
|
|
12
12
|
configuration:
|
|
13
|
-
runs-on: ubuntu-
|
|
13
|
+
runs-on: blacksmith-4vcpu-ubuntu-2404
|
|
14
14
|
outputs:
|
|
15
15
|
provider: ${{ steps.config.outputs.provider }}
|
|
16
16
|
account: ${{ steps.config.outputs.account }}
|
|
17
17
|
registry: ${{ steps.config.outputs.registry }}
|
|
18
18
|
steps:
|
|
19
|
-
- uses: actions/checkout@
|
|
20
|
-
- uses: pnpm/action-setup@
|
|
19
|
+
- uses: actions/checkout@v5
|
|
20
|
+
- uses: pnpm/action-setup@v5
|
|
21
21
|
with:
|
|
22
22
|
package_json_file: package.json
|
|
23
|
-
- uses: actions/setup-node@
|
|
23
|
+
- uses: actions/setup-node@v5
|
|
24
24
|
with:
|
|
25
25
|
node-version-file: .node-version
|
|
26
26
|
- run: pnpm install --frozen-lockfile
|
|
27
|
+
- run: pnpm lint && pnpm typecheck && pnpm test && pnpm build
|
|
27
28
|
- run: pnpm exec arcnet check
|
|
28
29
|
- id: config
|
|
29
30
|
run: pnpm exec arcnet ci
|
|
@@ -31,30 +32,30 @@ jobs:
|
|
|
31
32
|
deploy:
|
|
32
33
|
needs: configuration
|
|
33
34
|
if: github.ref == 'refs/heads/main'
|
|
34
|
-
runs-on: ubuntu-
|
|
35
|
+
runs-on: blacksmith-4vcpu-ubuntu-2404
|
|
35
36
|
timeout-minutes: 45
|
|
36
37
|
environment: arcnet-production
|
|
37
38
|
permissions:
|
|
38
39
|
contents: read
|
|
39
40
|
id-token: write
|
|
40
41
|
steps:
|
|
41
|
-
- uses: actions/checkout@
|
|
42
|
-
- uses: pnpm/action-setup@
|
|
42
|
+
- uses: actions/checkout@v5
|
|
43
|
+
- uses: pnpm/action-setup@v5
|
|
43
44
|
with:
|
|
44
45
|
package_json_file: package.json
|
|
45
|
-
- uses: actions/setup-node@
|
|
46
|
+
- uses: actions/setup-node@v5
|
|
46
47
|
with:
|
|
47
48
|
node-version-file: .node-version
|
|
48
49
|
- run: pnpm install --frozen-lockfile
|
|
49
|
-
- uses: google-github-actions/auth@
|
|
50
|
+
- uses: google-github-actions/auth@v3
|
|
50
51
|
with:
|
|
51
52
|
workload_identity_provider: ${{ needs.configuration.outputs.provider }}
|
|
52
53
|
service_account: ${{ needs.configuration.outputs.account }}
|
|
53
|
-
- uses: google-github-actions/setup-gcloud@
|
|
54
|
+
- uses: google-github-actions/setup-gcloud@v3
|
|
54
55
|
- run: gcloud auth configure-docker "$REGISTRY" --quiet
|
|
55
56
|
env:
|
|
56
57
|
REGISTRY: ${{ needs.configuration.outputs.registry }}
|
|
57
|
-
- uses: hashicorp/setup-terraform@
|
|
58
|
+
- uses: hashicorp/setup-terraform@v4
|
|
58
59
|
with:
|
|
59
60
|
terraform_version: 1.15.6
|
|
60
61
|
terraform_wrapper: false
|
|
@@ -10,20 +10,21 @@ concurrency:
|
|
|
10
10
|
cancel-in-progress: false
|
|
11
11
|
jobs:
|
|
12
12
|
configuration:
|
|
13
|
-
runs-on: ubuntu-
|
|
13
|
+
runs-on: blacksmith-4vcpu-ubuntu-2404
|
|
14
14
|
outputs:
|
|
15
15
|
provider: ${{ steps.config.outputs.provider }}
|
|
16
16
|
account: ${{ steps.config.outputs.account }}
|
|
17
17
|
registry: ${{ steps.config.outputs.registry }}
|
|
18
18
|
steps:
|
|
19
|
-
- uses: actions/checkout@
|
|
20
|
-
- uses: pnpm/action-setup@
|
|
19
|
+
- uses: actions/checkout@v5
|
|
20
|
+
- uses: pnpm/action-setup@v5
|
|
21
21
|
with:
|
|
22
22
|
package_json_file: package.json
|
|
23
|
-
- uses: actions/setup-node@
|
|
23
|
+
- uses: actions/setup-node@v5
|
|
24
24
|
with:
|
|
25
25
|
node-version-file: .node-version
|
|
26
26
|
- run: pnpm install --frozen-lockfile
|
|
27
|
+
- run: pnpm lint && pnpm typecheck && pnpm test && pnpm build
|
|
27
28
|
- run: pnpm exec arcnet check
|
|
28
29
|
- id: config
|
|
29
30
|
run: pnpm exec arcnet ci
|
|
@@ -31,30 +32,30 @@ jobs:
|
|
|
31
32
|
deploy:
|
|
32
33
|
needs: configuration
|
|
33
34
|
if: github.ref == 'refs/heads/main'
|
|
34
|
-
runs-on: ubuntu-
|
|
35
|
+
runs-on: blacksmith-4vcpu-ubuntu-2404
|
|
35
36
|
timeout-minutes: 45
|
|
36
37
|
environment: arcnet-production
|
|
37
38
|
permissions:
|
|
38
39
|
contents: read
|
|
39
40
|
id-token: write
|
|
40
41
|
steps:
|
|
41
|
-
- uses: actions/checkout@
|
|
42
|
-
- uses: pnpm/action-setup@
|
|
42
|
+
- uses: actions/checkout@v5
|
|
43
|
+
- uses: pnpm/action-setup@v5
|
|
43
44
|
with:
|
|
44
45
|
package_json_file: package.json
|
|
45
|
-
- uses: actions/setup-node@
|
|
46
|
+
- uses: actions/setup-node@v5
|
|
46
47
|
with:
|
|
47
48
|
node-version-file: .node-version
|
|
48
49
|
- run: pnpm install --frozen-lockfile
|
|
49
|
-
- uses: google-github-actions/auth@
|
|
50
|
+
- uses: google-github-actions/auth@v3
|
|
50
51
|
with:
|
|
51
52
|
workload_identity_provider: ${{ needs.configuration.outputs.provider }}
|
|
52
53
|
service_account: ${{ needs.configuration.outputs.account }}
|
|
53
|
-
- uses: google-github-actions/setup-gcloud@
|
|
54
|
+
- uses: google-github-actions/setup-gcloud@v3
|
|
54
55
|
- run: gcloud auth configure-docker "$REGISTRY" --quiet
|
|
55
56
|
env:
|
|
56
57
|
REGISTRY: ${{ needs.configuration.outputs.registry }}
|
|
57
|
-
- uses: hashicorp/setup-terraform@
|
|
58
|
+
- uses: hashicorp/setup-terraform@v4
|
|
58
59
|
with:
|
|
59
60
|
terraform_version: 1.15.6
|
|
60
61
|
terraform_wrapper: false
|
|
@@ -10,14 +10,15 @@ concurrency:
|
|
|
10
10
|
cancel-in-progress: false
|
|
11
11
|
jobs:
|
|
12
12
|
configuration:
|
|
13
|
-
runs-on: ubuntu-
|
|
13
|
+
runs-on: blacksmith-4vcpu-ubuntu-2404
|
|
14
14
|
steps:
|
|
15
|
-
- uses: actions/checkout@
|
|
16
|
-
- uses: actions/setup-node@
|
|
15
|
+
- uses: actions/checkout@v5
|
|
16
|
+
- uses: actions/setup-node@v5
|
|
17
17
|
with:
|
|
18
18
|
node-version-file: .node-version
|
|
19
|
-
- uses: pnpm/action-setup@
|
|
19
|
+
- uses: pnpm/action-setup@v5
|
|
20
20
|
- run: pnpm install --frozen-lockfile
|
|
21
|
+
- run: pnpm lint && pnpm typecheck && pnpm test && pnpm build
|
|
21
22
|
- run: pnpm exec arcnet check
|
|
22
23
|
- id: config
|
|
23
24
|
run: pnpm exec arcnet ci
|
|
@@ -26,14 +27,14 @@ jobs:
|
|
|
26
27
|
needs: configuration
|
|
27
28
|
if: github.ref == 'refs/heads/main'
|
|
28
29
|
environment: arcnet-production
|
|
29
|
-
runs-on: ubuntu-
|
|
30
|
+
runs-on: blacksmith-4vcpu-ubuntu-2404
|
|
30
31
|
timeout-minutes: 30
|
|
31
32
|
steps:
|
|
32
|
-
- uses: actions/checkout@
|
|
33
|
-
- uses: actions/setup-node@
|
|
33
|
+
- uses: actions/checkout@v5
|
|
34
|
+
- uses: actions/setup-node@v5
|
|
34
35
|
with:
|
|
35
36
|
node-version-file: .node-version
|
|
36
|
-
- uses: pnpm/action-setup@
|
|
37
|
+
- uses: pnpm/action-setup@v5
|
|
37
38
|
- run: pnpm install --frozen-lockfile
|
|
38
39
|
- name: Deploy referenced static sites
|
|
39
40
|
run: pnpm exec arcnet deploy
|
package/templates/network.yaml
CHANGED
|
@@ -85,7 +85,7 @@ module-defaults:
|
|
|
85
85
|
gcp-project-id: "{gcp-project}"
|
|
86
86
|
state-bucket: arcnet-platform-terraform-state
|
|
87
87
|
network-project: "{network-project}"
|
|
88
|
-
billing-account: "
|
|
88
|
+
billing-account: "" # Opt in only when CI manages budgets.
|
|
89
89
|
gcp-project:
|
|
90
90
|
project-id: "{gcp-project}"
|
|
91
91
|
billing-account: "{billing-account}"
|
|
@@ -30,21 +30,22 @@ hooks:
|
|
|
30
30
|
VERCEL_ORG_ID="$(curl -fsS -H "Authorization: Bearer ${VERCEL_API_TOKEN}" https://api.vercel.com/v2/user \
|
|
31
31
|
| node -e 'let d="";process.stdin.on("data",c=>d+=c);process.stdin.on("end",()=>console.log(JSON.parse(d).user.id))')"
|
|
32
32
|
export VERCEL_ORG_ID
|
|
33
|
+
export VERCEL_TOKEN="${VERCEL_API_TOKEN}"
|
|
33
34
|
if [ -n "${ARC_VERCEL_BUILD}" ]; then
|
|
34
35
|
bash -c "${ARC_VERCEL_BUILD}"
|
|
35
36
|
fi
|
|
36
37
|
if [ "${ARC_VERCEL_REMOTE_BUILD}" = "true" ]; then
|
|
37
|
-
npx -y vercel@63.1.2 pull --yes --environment=production
|
|
38
|
+
npx -y vercel@63.1.2 pull --yes --environment=production
|
|
38
39
|
while IFS= read -r kv; do
|
|
39
40
|
if [ -n "${kv}" ]; then
|
|
40
41
|
export "${kv?}"
|
|
41
42
|
fi
|
|
42
43
|
done <<< "$(node -e 'const env=JSON.parse(process.env.ARC_SERVICE_ENV||"{}");for(const [k,v] of Object.entries(env))console.log(`${k}=${v}`)')"
|
|
43
|
-
npx -y vercel@63.1.2 build --prod
|
|
44
|
-
npx -y vercel@63.1.2 deploy --prebuilt --prod --yes
|
|
44
|
+
npx -y vercel@63.1.2 build --prod
|
|
45
|
+
npx -y vercel@63.1.2 deploy --prebuilt --prod --yes
|
|
45
46
|
exit 0
|
|
46
47
|
fi
|
|
47
|
-
args=(--prod --yes
|
|
48
|
+
args=(--prod --yes)
|
|
48
49
|
if [ -n "${ARC_VERCEL_LOCAL_CONFIG}" ]; then
|
|
49
50
|
args+=(--local-config "${ARC_VERCEL_LOCAL_CONFIG}")
|
|
50
51
|
fi
|