@mp-lb/arcnet 0.5.3 → 0.5.4

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.
@@ -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;AAItD,eAAO,MAAM,UAAU,GAAI,QAAQ,YAAY,iDACoE,CAAC;AAEpH,eAAO,MAAM,aAAa,GAAI,QAAQ,YAAY,EAAE,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;CAU/D,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,QAAQ,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyDpD,CAAC"}
1
+ {"version":3,"file":"compileArcnet.d.ts","sourceRoot":"","sources":["../src/compileArcnet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAItD,eAAO,MAAM,UAAU,GAAI,QAAQ,YAAY,iDACoE,CAAC;AAEpH,eAAO,MAAM,aAAa,GAAI,QAAQ,YAAY,EAAE,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;CAU/D,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,QAAQ,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2DpD,CAAC"}
@@ -28,12 +28,15 @@ export const compileTerraform = (config) => {
28
28
  !service.domain)
29
29
  service.domain = `${["frontend", "web", "landing-page"].includes(name) ? "" : `${name === "backend" ? "api" : name}.`}${config.project}.mp-lb.dev`;
30
30
  }
31
- const modules = Object.values(services).map((service) => service.module);
31
+ const infrastructure = deployBlockSchema.shape.project.parse(config.infrastructure ?? {});
32
+ const modules = [
33
+ ...Object.values(services),
34
+ ...Object.values(infrastructure),
35
+ ].map((resource) => resource.module);
32
36
  const network = resolveEnvironment(config.environment, modules);
33
37
  for (const service of Object.values(services))
34
38
  if (service.module === "vercel-static")
35
39
  service.module = "./node_modules/@mp-lb/arcnet/templates/vercel-static";
36
- const infrastructure = deployBlockSchema.shape.project.parse(config.infrastructure ?? {});
37
40
  const project = {
38
41
  gcp: { module: "gcp-project" },
39
42
  registry: { module: "project-base", "depends-on": ["gcp"] },
@@ -1 +1 @@
1
- {"version":3,"file":"compileArcnet.js","sourceRoot":"","sources":["../src/compileArcnet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"compileArcnet.js","sourceRoot":"","sources":["../src/compileArcnet.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"runVercel.d.ts","sourceRoot":"","sources":["../src/runVercel.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,SAAS,GACpB,SAAS,MAAM,EACf,MAAM,MAAM,EACZ,WAAW,MAAM,EACjB,iBAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4FhB,CAAC"}
1
+ {"version":3,"file":"runVercel.d.ts","sourceRoot":"","sources":["../src/runVercel.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,SAAS,GACpB,SAAS,MAAM,EACf,MAAM,MAAM,EACZ,WAAW,MAAM,EACjB,iBAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+FhB,CAAC"}
package/dist/runVercel.js CHANGED
@@ -10,6 +10,7 @@ import { validateConfig } from "./validateConfig.js";
10
10
  import { stringify } from "yaml";
11
11
  import { arcnetConfigPath, hasArcnetConfig, readArcnetConfig, } from "./arcnetConfig.js";
12
12
  import { compileVercel } from "./compileArcnet.js";
13
+ import { resolvePublicEnv } from "./resolvePublicEnv.js";
13
14
  export const runVercel = async (command, root, argument, machine = false) => {
14
15
  const modern = hasArcnetConfig(root) ? readArcnetConfig(root) : undefined;
15
16
  const path = modern
@@ -70,7 +71,10 @@ export const runVercel = async (command, root, argument, machine = false) => {
70
71
  message: "Created project; review and commit project.json before CI. Deployment remains disabled.",
71
72
  };
72
73
  }
73
- await deploy(config, root, request, (cmd, args, cwd, env) => runProcess(cmd, args, cwd, env, machine), process.env, command === "preview" ? "preview" : "production");
74
+ await deploy(config, root, request, (cmd, args, cwd, env) => runProcess(cmd, args, cwd, env, machine), {
75
+ ...process.env,
76
+ ...(modern?.variables ? resolvePublicEnv(modern.variables, {}) : {}),
77
+ }, command === "preview" ? "preview" : "production");
74
78
  return { operation: command, message: "Selected sites deployed." };
75
79
  };
76
80
  //# sourceMappingURL=runVercel.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"runVercel.js","sourceRoot":"","sources":["../src/runVercel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"runVercel.js","sourceRoot":"","sources":["../src/runVercel.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mp-lb/arcnet",
3
- "version": "0.5.3",
3
+ "version": "0.5.4",
4
4
  "description": "ArcNet project installation and deployment CLI.",
5
5
  "license": "MIT",
6
6
  "type": "module",
@@ -42,16 +42,18 @@ export const compileTerraform = (config: ArcnetConfig) => {
42
42
  service.domain = `${["frontend", "web", "landing-page"].includes(name) ? "" : `${name === "backend" ? "api" : name}.`}${config.project}.mp-lb.dev`;
43
43
  }
44
44
 
45
- const modules = Object.values(services).map((service) => service.module);
45
+ const infrastructure = deployBlockSchema.shape.project.parse(
46
+ config.infrastructure ?? {},
47
+ );
48
+ const modules = [
49
+ ...Object.values(services),
50
+ ...Object.values(infrastructure),
51
+ ].map((resource) => resource.module);
46
52
  const network = resolveEnvironment(config.environment, modules);
47
53
  for (const service of Object.values(services))
48
54
  if (service.module === "vercel-static")
49
55
  service.module = "./node_modules/@mp-lb/arcnet/templates/vercel-static";
50
56
 
51
- const infrastructure = deployBlockSchema.shape.project.parse(
52
- config.infrastructure ?? {},
53
- );
54
-
55
57
  const project = {
56
58
  gcp: { module: "gcp-project" },
57
59
  registry: { module: "project-base", "depends-on": ["gcp"] },
package/src/runVercel.ts CHANGED
@@ -14,6 +14,7 @@ import {
14
14
  readArcnetConfig,
15
15
  } from "./arcnetConfig.js";
16
16
  import { compileVercel } from "./compileArcnet.js";
17
+ import { resolvePublicEnv } from "./resolvePublicEnv.js";
17
18
 
18
19
  export const runVercel = async (
19
20
  command: string,
@@ -106,7 +107,10 @@ export const runVercel = async (
106
107
  root,
107
108
  request,
108
109
  (cmd, args, cwd, env) => runProcess(cmd, args, cwd, env, machine),
109
- process.env,
110
+ {
111
+ ...process.env,
112
+ ...(modern?.variables ? resolvePublicEnv(modern.variables, {}) : {}),
113
+ },
110
114
  command === "preview" ? "preview" : "production",
111
115
  );
112
116