@solid-stack/builder 1.1.0 → 1.1.1
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 +52 -52
- package/dist/bin.js.map +1 -1
- package/dist/index.js +52 -52
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/dist/bin.js
CHANGED
|
@@ -2687,65 +2687,65 @@ ${explanation}`);
|
|
|
2687
2687
|
}
|
|
2688
2688
|
if (environment === "e2e") {
|
|
2689
2689
|
makeE2eDependOnApp(yml);
|
|
2690
|
-
|
|
2691
|
-
|
|
2692
|
-
|
|
2693
|
-
|
|
2694
|
-
|
|
2695
|
-
|
|
2696
|
-
|
|
2690
|
+
}
|
|
2691
|
+
if (buildJson.tester?.envOverrides && yml.services && yml.services.tester) {
|
|
2692
|
+
const INTERNAL_PORT = 3e3;
|
|
2693
|
+
const urlRegistry = /* @__PURE__ */ new Map();
|
|
2694
|
+
const appPublicPort = buildJson.port ? Number(buildJson.port) : null;
|
|
2695
|
+
urlRegistry.set("app", {
|
|
2696
|
+
networkUrl: `http://app:${INTERNAL_PORT}`,
|
|
2697
|
+
publicUrl: appPublicPort ? `http://localhost:${appPublicPort}` : null
|
|
2698
|
+
});
|
|
2699
|
+
if (buildJson.name && buildJson.name !== "app") {
|
|
2700
|
+
urlRegistry.set(buildJson.name, urlRegistry.get("app"));
|
|
2701
|
+
}
|
|
2702
|
+
for (const dep of dependencies) {
|
|
2703
|
+
urlRegistry.set(dep.name, {
|
|
2704
|
+
networkUrl: `http://${dep.name}:${INTERNAL_PORT}`,
|
|
2705
|
+
publicUrl: null
|
|
2697
2706
|
});
|
|
2698
|
-
|
|
2699
|
-
|
|
2700
|
-
|
|
2701
|
-
for (const
|
|
2702
|
-
|
|
2703
|
-
|
|
2704
|
-
|
|
2705
|
-
|
|
2706
|
-
|
|
2707
|
-
|
|
2708
|
-
let output = val;
|
|
2709
|
-
for (const [sName, urls] of urlRegistry.entries()) {
|
|
2710
|
-
const escaped = sName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
2707
|
+
}
|
|
2708
|
+
const interpolateEnv = (val) => {
|
|
2709
|
+
let output = val;
|
|
2710
|
+
for (const [sName, urls] of urlRegistry.entries()) {
|
|
2711
|
+
const escaped = sName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
2712
|
+
output = output.replace(
|
|
2713
|
+
new RegExp(`\\$\\{${escaped}\\.network_url\\}`, "g"),
|
|
2714
|
+
urls.networkUrl
|
|
2715
|
+
);
|
|
2716
|
+
if (urls.publicUrl) {
|
|
2711
2717
|
output = output.replace(
|
|
2712
|
-
new RegExp(`\\$\\{${escaped}\\.
|
|
2713
|
-
urls.
|
|
2718
|
+
new RegExp(`\\$\\{${escaped}\\.public_url\\}`, "g"),
|
|
2719
|
+
urls.publicUrl
|
|
2714
2720
|
);
|
|
2715
|
-
if (urls.publicUrl) {
|
|
2716
|
-
output = output.replace(
|
|
2717
|
-
new RegExp(`\\$\\{${escaped}\\.public_url\\}`, "g"),
|
|
2718
|
-
urls.publicUrl
|
|
2719
|
-
);
|
|
2720
|
-
}
|
|
2721
2721
|
}
|
|
2722
|
-
|
|
2723
|
-
|
|
2724
|
-
|
|
2725
|
-
|
|
2726
|
-
|
|
2727
|
-
|
|
2728
|
-
|
|
2729
|
-
|
|
2730
|
-
|
|
2731
|
-
|
|
2732
|
-
|
|
2733
|
-
|
|
2734
|
-
|
|
2735
|
-
|
|
2736
|
-
|
|
2737
|
-
|
|
2738
|
-
|
|
2739
|
-
|
|
2722
|
+
}
|
|
2723
|
+
const unresolvedMatch = output.match(/\$\{([^}]+?)\.(network_url|public_url)\}/);
|
|
2724
|
+
if (unresolvedMatch) {
|
|
2725
|
+
throw new ScriptError(
|
|
2726
|
+
`[Local E2E Tester] Unresolved template variable: ${unresolvedMatch[0]}. Check build.json dependencies.`
|
|
2727
|
+
);
|
|
2728
|
+
}
|
|
2729
|
+
return output;
|
|
2730
|
+
};
|
|
2731
|
+
if (Array.isArray(yml.services.tester.environment)) {
|
|
2732
|
+
const envObj = {};
|
|
2733
|
+
for (const item of yml.services.tester.environment) {
|
|
2734
|
+
if (typeof item === "string") {
|
|
2735
|
+
const eqIdx = item.indexOf("=");
|
|
2736
|
+
if (eqIdx !== -1) {
|
|
2737
|
+
envObj[item.slice(0, eqIdx)] = item.slice(eqIdx + 1);
|
|
2738
|
+
} else {
|
|
2739
|
+
envObj[item] = process.env[item] ?? null;
|
|
2740
2740
|
}
|
|
2741
2741
|
}
|
|
2742
|
-
yml.services.tester.environment = envObj;
|
|
2743
|
-
} else if (!yml.services.tester.environment || typeof yml.services.tester.environment !== "object") {
|
|
2744
|
-
yml.services.tester.environment = {};
|
|
2745
|
-
}
|
|
2746
|
-
for (const [k, v] of Object.entries(buildJson.tester.envOverrides)) {
|
|
2747
|
-
yml.services.tester.environment[k] = interpolateEnv(v);
|
|
2748
2742
|
}
|
|
2743
|
+
yml.services.tester.environment = envObj;
|
|
2744
|
+
} else if (!yml.services.tester.environment || typeof yml.services.tester.environment !== "object") {
|
|
2745
|
+
yml.services.tester.environment = {};
|
|
2746
|
+
}
|
|
2747
|
+
for (const [k, v] of Object.entries(buildJson.tester.envOverrides)) {
|
|
2748
|
+
yml.services.tester.environment[k] = interpolateEnv(v);
|
|
2749
2749
|
}
|
|
2750
2750
|
}
|
|
2751
2751
|
attachName(yml, projectName);
|