@solid-stack/builder 1.1.5 → 1.1.6

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/bin.js CHANGED
@@ -1232,12 +1232,13 @@ function compileMeshEnvironment(mode, rawMeshDir = process.cwd(), options = {})
1232
1232
  let overrideVolumes = [];
1233
1233
  let overrideHealthcheck = void 0;
1234
1234
  let overrideCommand = void 0;
1235
+ let overrideApp = void 0;
1235
1236
  const stageOverride = serviceOverrides[mode];
1236
1237
  if (stageOverride && existsSync(stageOverride.path)) {
1237
1238
  try {
1238
1239
  const overrideYaml = parse(readFileSync(stageOverride.path, "utf-8"));
1239
1240
  mergeTopLevelResources(overrideYaml);
1240
- const overrideApp = overrideYaml?.services?.app || overrideYaml?.services?.[serviceName];
1241
+ overrideApp = overrideYaml?.services?.app || overrideYaml?.services?.[serviceName];
1241
1242
  if (!overrideApp && overrideYaml?.services && Object.keys(overrideYaml.services).length > 0) {
1242
1243
  throw new ScriptError(
1243
1244
  `Override file "${stageOverride.path}" must define service "app" or "${serviceName}".`
@@ -1277,16 +1278,41 @@ function compileMeshEnvironment(mode, rawMeshDir = process.cwd(), options = {})
1277
1278
  }
1278
1279
  }
1279
1280
  environment.PORT = String(INTERNAL_PORT);
1281
+ const buildArgs = {};
1282
+ if (overrideApp?.build?.args) {
1283
+ if (Array.isArray(overrideApp.build.args)) {
1284
+ for (const item of overrideApp.build.args) {
1285
+ if (typeof item === "string") {
1286
+ const eqIdx = item.indexOf("=");
1287
+ if (eqIdx !== -1) {
1288
+ buildArgs[item.slice(0, eqIdx)] = item.slice(eqIdx + 1);
1289
+ } else {
1290
+ buildArgs[item] = process.env[item] ?? null;
1291
+ }
1292
+ }
1293
+ }
1294
+ } else if (typeof overrideApp.build.args === "object") {
1295
+ Object.assign(buildArgs, overrideApp.build.args);
1296
+ }
1297
+ }
1298
+ if (serviceBuildJson.envOverrides) {
1299
+ for (const [k, v] of Object.entries(serviceBuildJson.envOverrides)) {
1300
+ buildArgs[k] = interpolateEnvTemplates(v, `Service build.json: ${serviceName}`);
1301
+ }
1302
+ }
1280
1303
  if (serviceConfig.envOverrides) {
1281
1304
  for (const [k, v] of Object.entries(serviceConfig.envOverrides)) {
1282
- environment[k] = interpolateEnvTemplates(v, `Service: ${serviceName}`);
1305
+ const interpolated = interpolateEnvTemplates(v, `Service: ${serviceName}`);
1306
+ environment[k] = interpolated;
1307
+ buildArgs[k] = interpolated;
1283
1308
  }
1284
1309
  }
1285
1310
  const serviceDef = {
1286
1311
  build: {
1287
1312
  context: relServiceDir,
1288
1313
  dockerfile,
1289
- target: mode
1314
+ target: mode,
1315
+ ...Object.keys(buildArgs).length > 0 ? { args: buildArgs } : {}
1290
1316
  },
1291
1317
  init: true,
1292
1318
  logging: {
@@ -2794,16 +2820,51 @@ ${explanation}`);
2794
2820
  serviceConfig.environment = {};
2795
2821
  }
2796
2822
  };
2823
+ const normalizeBuildArgs = (serviceConfig) => {
2824
+ if (typeof serviceConfig.build === "string") {
2825
+ serviceConfig.build = {
2826
+ context: serviceConfig.build
2827
+ };
2828
+ }
2829
+ if (serviceConfig.build && typeof serviceConfig.build === "object") {
2830
+ if (Array.isArray(serviceConfig.build.args)) {
2831
+ const argsObj = {};
2832
+ for (const item of serviceConfig.build.args) {
2833
+ if (typeof item === "string") {
2834
+ const eqIdx = item.indexOf("=");
2835
+ if (eqIdx !== -1) {
2836
+ argsObj[item.slice(0, eqIdx)] = item.slice(eqIdx + 1);
2837
+ } else {
2838
+ argsObj[item] = process.env[item] ?? null;
2839
+ }
2840
+ }
2841
+ }
2842
+ serviceConfig.build.args = argsObj;
2843
+ } else if (!serviceConfig.build.args || typeof serviceConfig.build.args !== "object") {
2844
+ serviceConfig.build.args = {};
2845
+ }
2846
+ }
2847
+ };
2797
2848
  if (buildJson.envOverrides && yml.services && yml.services.app) {
2798
2849
  normalizeEnvironment(yml.services.app);
2850
+ normalizeBuildArgs(yml.services.app);
2799
2851
  for (const [k, v] of Object.entries(buildJson.envOverrides)) {
2800
- yml.services.app.environment[k] = interpolateEnv(v, "App EnvOverrides");
2852
+ const val = interpolateEnv(v, "App EnvOverrides");
2853
+ yml.services.app.environment[k] = val;
2854
+ if (yml.services.app.build?.args) {
2855
+ yml.services.app.build.args[k] = val;
2856
+ }
2801
2857
  }
2802
2858
  }
2803
2859
  if (buildJson.tester?.envOverrides && yml.services && yml.services.tester) {
2804
2860
  normalizeEnvironment(yml.services.tester);
2861
+ normalizeBuildArgs(yml.services.tester);
2805
2862
  for (const [k, v] of Object.entries(buildJson.tester.envOverrides)) {
2806
- yml.services.tester.environment[k] = interpolateEnv(v, "Tester EnvOverrides");
2863
+ const val = interpolateEnv(v, "Tester EnvOverrides");
2864
+ yml.services.tester.environment[k] = val;
2865
+ if (yml.services.tester.build?.args) {
2866
+ yml.services.tester.build.args[k] = val;
2867
+ }
2807
2868
  }
2808
2869
  }
2809
2870
  if (yml.services) {