@mp-lb/arcnet 0.7.19 → 0.7.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/checkIdentity.d.ts +1 -1
- package/dist/checkIdentity.d.ts.map +1 -1
- package/dist/checkIdentity.js +4 -1
- package/dist/checkIdentity.js.map +1 -1
- package/dist/createProject.d.ts.map +1 -1
- package/dist/createProject.js +2 -6
- package/dist/createProject.js.map +1 -1
- package/dist/inspectReferences.d.ts.map +1 -1
- package/dist/inspectReferences.js +1 -2
- package/dist/inspectReferences.js.map +1 -1
- package/dist/resolveDeploymentProjects.d.ts +1 -2
- package/dist/resolveDeploymentProjects.d.ts.map +1 -1
- package/dist/resolveDeploymentProjects.js +2 -13
- package/dist/resolveDeploymentProjects.js.map +1 -1
- package/package.json +1 -1
- package/src/checkIdentity.ts +4 -1
- package/src/createProject.ts +2 -10
- package/src/inspectReferences.ts +4 -2
- package/src/resolveDeploymentProjects.ts +5 -29
package/dist/checkIdentity.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { VercelAccount, VercelResponse, VercelSite } from "./schemas.js";
|
|
2
|
-
export declare const checkIdentity: (project: VercelResponse | null, site: VercelSite, account: VercelAccount) =>
|
|
2
|
+
export declare const checkIdentity: (project: VercelResponse | null, site: VercelSite, account: VercelAccount) => string;
|
|
3
3
|
//# sourceMappingURL=checkIdentity.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkIdentity.d.ts","sourceRoot":"","sources":["../src/checkIdentity.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE9E,eAAO,MAAM,aAAa,GACxB,SAAS,cAAc,GAAG,IAAI,EAC9B,MAAM,UAAU,EAChB,SAAS,aAAa,
|
|
1
|
+
{"version":3,"file":"checkIdentity.d.ts","sourceRoot":"","sources":["../src/checkIdentity.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE9E,eAAO,MAAM,aAAa,GACxB,SAAS,cAAc,GAAG,IAAI,EAC9B,MAAM,UAAU,EAChB,SAAS,aAAa,WAevB,CAAC"}
|
package/dist/checkIdentity.js
CHANGED
|
@@ -2,10 +2,13 @@ import { checkProjectSettings } from "./checkProjectSettings.js";
|
|
|
2
2
|
import { fail } from "./fail.js";
|
|
3
3
|
export const checkIdentity = (project, site, account) => {
|
|
4
4
|
if (!project ||
|
|
5
|
-
|
|
5
|
+
(site.mode === "existing"
|
|
6
|
+
? project.id !== site.projectId
|
|
7
|
+
: !/^prj_[A-Za-z0-9]+$/.test(project.id ?? "")) ||
|
|
6
8
|
project.name !== site.projectName ||
|
|
7
9
|
project.accountId !== account.id)
|
|
8
10
|
fail(`Project identity/scope mismatch for ${site.projectName}. No deployment attempted.`);
|
|
9
11
|
checkProjectSettings(project, site);
|
|
12
|
+
return project.id;
|
|
10
13
|
};
|
|
11
14
|
//# sourceMappingURL=checkIdentity.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkIdentity.js","sourceRoot":"","sources":["../src/checkIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,OAA8B,EAC9B,IAAgB,EAChB,OAAsB,EACtB,EAAE;IACF,IACE,CAAC,OAAO;QACR,OAAO,CAAC,EAAE,KAAK,IAAI,CAAC,SAAS;
|
|
1
|
+
{"version":3,"file":"checkIdentity.js","sourceRoot":"","sources":["../src/checkIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,OAA8B,EAC9B,IAAgB,EAChB,OAAsB,EACtB,EAAE;IACF,IACE,CAAC,OAAO;QACR,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU;YACvB,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,IAAI,CAAC,SAAS;YAC/B,CAAC,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,WAAW;QACjC,OAAO,CAAC,SAAS,KAAK,OAAO,CAAC,EAAE;QAEhC,IAAI,CACF,uCAAuC,IAAI,CAAC,WAAW,4BAA4B,CACpF,CAAC;IACJ,oBAAoB,CAAC,OAAQ,EAAE,IAAI,CAAC,CAAC;IACrC,OAAO,OAAQ,CAAC,EAAG,CAAC;AACtB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
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;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
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;;;;;;;;;;;;;;;;;;;;;;;;;EA+CrB,CAAC"}
|
package/dist/createProject.js
CHANGED
|
@@ -24,13 +24,9 @@ export const createProject = async (config, name, request, root = process.cwd())
|
|
|
24
24
|
? { rootDirectory: site.root }
|
|
25
25
|
: {}),
|
|
26
26
|
});
|
|
27
|
-
|
|
28
|
-
!/^prj_[A-Za-z0-9]+$/.test(created.id ?? "") ||
|
|
29
|
-
created.accountId !== config.account.id ||
|
|
30
|
-
created.name !== site.projectName)
|
|
31
|
-
fail("Creation response identity mismatch. Inspect the account before retrying.");
|
|
27
|
+
const projectId = checkIdentity(created, site, config.account);
|
|
32
28
|
const next = structuredClone(config);
|
|
33
|
-
next.sites[name] = { ...site, mode: "existing", projectId
|
|
29
|
+
next.sites[name] = { ...site, mode: "existing", projectId };
|
|
34
30
|
return next;
|
|
35
31
|
};
|
|
36
32
|
//# sourceMappingURL=createProject.js.map
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,MAAM,SAAS,GAAG,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/D,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,CAAC;IAC5D,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectReferences.d.ts","sourceRoot":"","sources":["../src/inspectReferences.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"inspectReferences.d.ts","sourceRoot":"","sources":["../src/inspectReferences.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAEhE,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,YAAY,EACpB,SAAS,aAAa,sBAwBvB,CAAC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { checkIdentity } from "./checkIdentity.js";
|
|
2
|
-
import { checkNamedProject } from "./resolveDeploymentProjects.js";
|
|
3
2
|
export const inspectReferences = async (config, request) => {
|
|
4
3
|
const missing = [];
|
|
5
4
|
for (const site of Object.values(config.sites)) {
|
|
@@ -9,7 +8,7 @@ export const inspectReferences = async (config, request) => {
|
|
|
9
8
|
else {
|
|
10
9
|
const project = await request("GET", `/v9/projects/${encodeURIComponent(site.projectName)}`, config.account);
|
|
11
10
|
if (project)
|
|
12
|
-
|
|
11
|
+
checkIdentity(project, site, config.account);
|
|
13
12
|
else
|
|
14
13
|
missing.push(site.projectName);
|
|
15
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectReferences.js","sourceRoot":"","sources":["../src/inspectReferences.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"inspectReferences.js","sourceRoot":"","sources":["../src/inspectReferences.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EACpC,MAAoB,EACpB,OAAsB,EACtB,EAAE;IACF,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/C,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC7B,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;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,OAAO,GAAG,MAAM,OAAO,CAC3B,KAAK,EACL,gBAAgB,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,EACtD,MAAM,CAAC,OAAO,CACf,CAAC;YAEF,IAAI,OAAO;gBAAE,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;;gBACrD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import type { VercelConfig, VercelRequest
|
|
2
|
-
export declare const checkNamedProject: (project: VercelResponse, site: VercelSite, accountId: string) => string;
|
|
1
|
+
import type { VercelConfig, VercelRequest } from "./schemas.js";
|
|
3
2
|
export declare const resolveDeploymentProjects: (config: VercelConfig, request: VercelRequest, allowCreate?: boolean, root?: string) => Promise<VercelConfig>;
|
|
4
3
|
//# 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,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAEhE,eAAO,MAAM,yBAAyB,GACpC,QAAQ,YAAY,EACpB,SAAS,aAAa,EACtB,qBAAkB,EAClB,aAAoB,KACnB,OAAO,CAAC,YAAY,CAoEtB,CAAC"}
|
|
@@ -1,15 +1,6 @@
|
|
|
1
|
-
import { checkProjectSettings } from "./checkProjectSettings.js";
|
|
2
1
|
import { readNodeVersion } from "./readNodeVersion.js";
|
|
3
2
|
import { checkIdentity } from "./checkIdentity.js";
|
|
4
3
|
import { fail } from "./fail.js";
|
|
5
|
-
export const checkNamedProject = (project, site, accountId) => {
|
|
6
|
-
if (!/^prj_[A-Za-z0-9]+$/.test(project.id ?? "") ||
|
|
7
|
-
project.name !== site.projectName ||
|
|
8
|
-
project.accountId !== accountId)
|
|
9
|
-
fail(`Project identity/settings mismatch for ${site.projectName}. No deployment attempted.`);
|
|
10
|
-
checkProjectSettings(project, site);
|
|
11
|
-
return project.id;
|
|
12
|
-
};
|
|
13
4
|
export const resolveDeploymentProjects = async (config, request, allowCreate = true, root = process.cwd()) => {
|
|
14
5
|
const resolved = structuredClone(config);
|
|
15
6
|
const missing = [];
|
|
@@ -21,7 +12,7 @@ export const resolveDeploymentProjects = async (config, request, allowCreate = t
|
|
|
21
12
|
}
|
|
22
13
|
const project = await request("GET", `/v9/projects/${encodeURIComponent(site.projectName)}`, config.account);
|
|
23
14
|
if (project) {
|
|
24
|
-
resolved.sites[name].projectId =
|
|
15
|
+
resolved.sites[name].projectId = checkIdentity(project, site, config.account);
|
|
25
16
|
}
|
|
26
17
|
else {
|
|
27
18
|
missing.push(name);
|
|
@@ -44,9 +35,7 @@ export const resolveDeploymentProjects = async (config, request, allowCreate = t
|
|
|
44
35
|
? { rootDirectory: site.root }
|
|
45
36
|
: {}),
|
|
46
37
|
});
|
|
47
|
-
|
|
48
|
-
fail(`Vercel returned no project for ${site.projectName}.`);
|
|
49
|
-
resolved.sites[name].projectId = checkNamedProject(created, site, config.account.id);
|
|
38
|
+
resolved.sites[name].projectId = checkIdentity(created, site, config.account);
|
|
50
39
|
}
|
|
51
40
|
for (const site of Object.values(resolved.sites)) {
|
|
52
41
|
site.mode = "existing";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveDeploymentProjects.js","sourceRoot":"","sources":["../src/resolveDeploymentProjects.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"resolveDeploymentProjects.js","sourceRoot":"","sources":["../src/resolveDeploymentProjects.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/checkIdentity.ts
CHANGED
|
@@ -9,7 +9,9 @@ export const checkIdentity = (
|
|
|
9
9
|
) => {
|
|
10
10
|
if (
|
|
11
11
|
!project ||
|
|
12
|
-
|
|
12
|
+
(site.mode === "existing"
|
|
13
|
+
? project.id !== site.projectId
|
|
14
|
+
: !/^prj_[A-Za-z0-9]+$/.test(project.id ?? "")) ||
|
|
13
15
|
project.name !== site.projectName ||
|
|
14
16
|
project.accountId !== account.id
|
|
15
17
|
)
|
|
@@ -17,4 +19,5 @@ export const checkIdentity = (
|
|
|
17
19
|
`Project identity/scope mismatch for ${site.projectName}. No deployment attempted.`,
|
|
18
20
|
);
|
|
19
21
|
checkProjectSettings(project!, site);
|
|
22
|
+
return project!.id!;
|
|
20
23
|
};
|
package/src/createProject.ts
CHANGED
|
@@ -50,16 +50,8 @@ export const createProject = async (
|
|
|
50
50
|
: {}),
|
|
51
51
|
});
|
|
52
52
|
|
|
53
|
-
|
|
54
|
-
!created ||
|
|
55
|
-
!/^prj_[A-Za-z0-9]+$/.test(created.id ?? "") ||
|
|
56
|
-
created.accountId !== config.account.id ||
|
|
57
|
-
created.name !== site.projectName
|
|
58
|
-
)
|
|
59
|
-
fail(
|
|
60
|
-
"Creation response identity mismatch. Inspect the account before retrying.",
|
|
61
|
-
);
|
|
53
|
+
const projectId = checkIdentity(created, site, config.account);
|
|
62
54
|
const next = structuredClone(config);
|
|
63
|
-
next.sites[name] = { ...site, mode: "existing", projectId
|
|
55
|
+
next.sites[name] = { ...site, mode: "existing", projectId };
|
|
64
56
|
return next;
|
|
65
57
|
};
|
package/src/inspectReferences.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { checkIdentity } from "./checkIdentity.js";
|
|
2
|
-
import { checkNamedProject } from "./resolveDeploymentProjects.js";
|
|
3
2
|
import type { VercelConfig, VercelRequest } from "./schemas.js";
|
|
4
3
|
|
|
5
4
|
export const inspectReferences = async (
|
|
@@ -7,6 +6,7 @@ export const inspectReferences = async (
|
|
|
7
6
|
request: VercelRequest,
|
|
8
7
|
) => {
|
|
9
8
|
const missing: string[] = [];
|
|
9
|
+
|
|
10
10
|
for (const site of Object.values(config.sites)) {
|
|
11
11
|
if (site.mode === "existing") {
|
|
12
12
|
checkIdentity(
|
|
@@ -20,9 +20,11 @@ export const inspectReferences = async (
|
|
|
20
20
|
`/v9/projects/${encodeURIComponent(site.projectName)}`,
|
|
21
21
|
config.account,
|
|
22
22
|
);
|
|
23
|
-
|
|
23
|
+
|
|
24
|
+
if (project) checkIdentity(project, site, config.account);
|
|
24
25
|
else missing.push(site.projectName);
|
|
25
26
|
}
|
|
26
27
|
}
|
|
28
|
+
|
|
27
29
|
return missing;
|
|
28
30
|
};
|
|
@@ -1,30 +1,7 @@
|
|
|
1
|
-
import { checkProjectSettings } from "./checkProjectSettings.js";
|
|
2
1
|
import { readNodeVersion } from "./readNodeVersion.js";
|
|
3
2
|
import { checkIdentity } from "./checkIdentity.js";
|
|
4
3
|
import { fail } from "./fail.js";
|
|
5
|
-
import type {
|
|
6
|
-
VercelConfig,
|
|
7
|
-
VercelRequest,
|
|
8
|
-
VercelResponse,
|
|
9
|
-
VercelSite,
|
|
10
|
-
} from "./schemas.js";
|
|
11
|
-
|
|
12
|
-
export const checkNamedProject = (
|
|
13
|
-
project: VercelResponse,
|
|
14
|
-
site: VercelSite,
|
|
15
|
-
accountId: string,
|
|
16
|
-
) => {
|
|
17
|
-
if (
|
|
18
|
-
!/^prj_[A-Za-z0-9]+$/.test(project.id ?? "") ||
|
|
19
|
-
project.name !== site.projectName ||
|
|
20
|
-
project.accountId !== accountId
|
|
21
|
-
)
|
|
22
|
-
fail(
|
|
23
|
-
`Project identity/settings mismatch for ${site.projectName}. No deployment attempted.`,
|
|
24
|
-
);
|
|
25
|
-
checkProjectSettings(project, site);
|
|
26
|
-
return project.id!;
|
|
27
|
-
};
|
|
4
|
+
import type { VercelConfig, VercelRequest } from "./schemas.js";
|
|
28
5
|
|
|
29
6
|
export const resolveDeploymentProjects = async (
|
|
30
7
|
config: VercelConfig,
|
|
@@ -54,10 +31,10 @@ export const resolveDeploymentProjects = async (
|
|
|
54
31
|
);
|
|
55
32
|
|
|
56
33
|
if (project) {
|
|
57
|
-
resolved.sites[name]!.projectId =
|
|
34
|
+
resolved.sites[name]!.projectId = checkIdentity(
|
|
58
35
|
project,
|
|
59
36
|
site,
|
|
60
|
-
config.account
|
|
37
|
+
config.account,
|
|
61
38
|
);
|
|
62
39
|
} else {
|
|
63
40
|
missing.push(name);
|
|
@@ -87,11 +64,10 @@ export const resolveDeploymentProjects = async (
|
|
|
87
64
|
: {}),
|
|
88
65
|
});
|
|
89
66
|
|
|
90
|
-
|
|
91
|
-
resolved.sites[name]!.projectId = checkNamedProject(
|
|
67
|
+
resolved.sites[name]!.projectId = checkIdentity(
|
|
92
68
|
created,
|
|
93
69
|
site,
|
|
94
|
-
config.account
|
|
70
|
+
config.account,
|
|
95
71
|
);
|
|
96
72
|
}
|
|
97
73
|
|