@catladder/cli 0.0.0-main-62f57d7f → 0.0.0-main-1303b0e9
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/bundles/catenv/index.js +55 -12
- package/dist/bundles/cli/index.js +8 -9
- package/dist/cli/src/apps/catenv/catenv.d.ts +4 -1
- package/dist/cli/src/apps/catenv/catenv.js +5 -1
- package/dist/cli/src/apps/catenv/catenv.js.map +1 -1
- package/dist/cli/src/apps/catenv/verboseBanner.d.ts +1 -0
- package/dist/cli/src/apps/catenv/verboseBanner.js +30 -0
- package/dist/cli/src/apps/catenv/verboseBanner.js.map +1 -0
- package/dist/cli/src/catenv.js +5 -2
- package/dist/cli/src/catenv.js.map +1 -1
- package/dist/pipeline/src/context/getEnvironmentVariables.d.ts +4 -4
- package/dist/pipeline/src/context/getEnvironmentVariables.js +8 -8
- package/dist/pipeline/src/context/getEnvironmentVariables.js.map +1 -1
- package/dist/pipeline/src/defaults/index.js +0 -1
- package/dist/pipeline/src/defaults/index.js.map +1 -1
- package/dist/pipeline/src/types/config.d.ts +5 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/apps/catenv/catenv.ts +8 -2
- package/src/apps/catenv/verboseBanner.ts +33 -0
- package/src/catenv.ts +6 -2
|
@@ -9,16 +9,20 @@
|
|
|
9
9
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
10
10
|
const getProjectConfig_1 = __nccwpck_require__(1);
|
|
11
11
|
const printVariables_1 = __nccwpck_require__(5110);
|
|
12
|
+
const verboseBanner_1 = __nccwpck_require__(5472);
|
|
12
13
|
const writeDotEnvFiles_1 = __nccwpck_require__(5614);
|
|
13
14
|
const writeEnvDTs_1 = __nccwpck_require__(8832);
|
|
14
15
|
const pipeline_1 = __nccwpck_require__(241);
|
|
15
|
-
exports["default"] = async (choice) => {
|
|
16
|
+
exports["default"] = async (choice, options) => {
|
|
16
17
|
var _a;
|
|
17
18
|
const config = await (0, getProjectConfig_1.getProjectConfig)();
|
|
18
19
|
if (!config) {
|
|
19
20
|
return;
|
|
20
21
|
}
|
|
21
22
|
const context = (0, pipeline_1.createCatenvContext)(config);
|
|
23
|
+
if (options === null || options === void 0 ? void 0 : options.verbose) {
|
|
24
|
+
(0, verboseBanner_1.printVerboseBanner)();
|
|
25
|
+
}
|
|
22
26
|
await Promise.all([
|
|
23
27
|
(0, pipeline_1.generatePipelineFiles)(context, (_a = config.pipelineType) !== null && _a !== void 0 ? _a : "gitlab"),
|
|
24
28
|
(0, writeDotEnvFiles_1.writeDotEnvFiles)(context, choice),
|
|
@@ -128,6 +132,43 @@ exports.sanitizeEnvVarName = sanitizeEnvVarName;
|
|
|
128
132
|
|
|
129
133
|
/***/ }),
|
|
130
134
|
|
|
135
|
+
/***/ 5472:
|
|
136
|
+
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
|
|
137
|
+
|
|
138
|
+
"use strict";
|
|
139
|
+
|
|
140
|
+
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
141
|
+
exports.printVerboseBanner = void 0;
|
|
142
|
+
const getProjectConfig_1 = __nccwpck_require__(1);
|
|
143
|
+
const printVerboseBanner = async () => {
|
|
144
|
+
const config = await (0, getProjectConfig_1.getProjectConfig)();
|
|
145
|
+
if (!config) {
|
|
146
|
+
return;
|
|
147
|
+
}
|
|
148
|
+
const allCompontsWithPorts = await Promise.all(Object.keys(config.components).map(async (componentName) => {
|
|
149
|
+
const environment = await (0, getProjectConfig_1.getEnvironment)("local", componentName);
|
|
150
|
+
const port = environment.envVars.PORT;
|
|
151
|
+
if (!port) {
|
|
152
|
+
return null;
|
|
153
|
+
}
|
|
154
|
+
return `${componentName}: http://localhost:${port}`;
|
|
155
|
+
})).then((lines) => lines.filter(Boolean));
|
|
156
|
+
const lines = [
|
|
157
|
+
"catenv",
|
|
158
|
+
"-------",
|
|
159
|
+
"running on:",
|
|
160
|
+
"",
|
|
161
|
+
...allCompontsWithPorts,
|
|
162
|
+
];
|
|
163
|
+
for (const line of lines) {
|
|
164
|
+
console.log(line);
|
|
165
|
+
}
|
|
166
|
+
};
|
|
167
|
+
exports.printVerboseBanner = printVerboseBanner;
|
|
168
|
+
//# sourceMappingURL=verboseBanner.js.map
|
|
169
|
+
|
|
170
|
+
/***/ }),
|
|
171
|
+
|
|
131
172
|
/***/ 5614:
|
|
132
173
|
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
|
|
133
174
|
|
|
@@ -243,10 +284,13 @@ const args = process.argv.slice(2);
|
|
|
243
284
|
const helpFlags = ["--help", "-h", "help"];
|
|
244
285
|
if (args.some((arg) => helpFlags.includes(arg))) {
|
|
245
286
|
const docLink = "https://git.panter.ch/catladder/catladder/-/blob/main/docs/1_VARS.md";
|
|
246
|
-
console.log(`\nUsage: catenv [env|env:component]\n\nEnv variable and catenv documentation:\n${docLink}`);
|
|
287
|
+
console.log(`\nUsage: catenv [env|env:component] [-v|--verbose]\n\nEnv variable and catenv documentation:\n${docLink}`);
|
|
247
288
|
process.exit(0);
|
|
248
289
|
}
|
|
249
|
-
|
|
290
|
+
const verbose = args.some((arg) => arg === "-v" || arg === "--verbose");
|
|
291
|
+
// choise arg is deprecated and will be removed in the future
|
|
292
|
+
const choiceArg = args.find((arg) => arg !== "-v" && arg !== "--verbose");
|
|
293
|
+
(0, catenv_1.default)(choiceArg ? (0, parseChoice_1.parseChoice)(choiceArg) : null, { verbose }).then(() => {
|
|
250
294
|
// we have to exit manually, because we have some file watches
|
|
251
295
|
process.exit();
|
|
252
296
|
});
|
|
@@ -3311,17 +3355,17 @@ const getEnvironmentVariables = async (ctx, options = {}) => {
|
|
|
3311
3355
|
let url;
|
|
3312
3356
|
if (envType === "local") {
|
|
3313
3357
|
const devLocalConfig = envConfigRaw;
|
|
3314
|
-
const port = (_a = devLocalConfig.port) !== null && _a !== void 0 ? _a : 3000;
|
|
3315
|
-
host = "localhost:" + port.toString();
|
|
3316
|
-
url = "http://" + host;
|
|
3358
|
+
const port = devLocalConfig.port !== false ? ((_a = devLocalConfig.port) !== null && _a !== void 0 ? _a : 3000) : null;
|
|
3359
|
+
host = port ? "localhost:" + port.toString() : null;
|
|
3360
|
+
url = host ? "http://" + host : null;
|
|
3317
3361
|
predefinedVariables = {
|
|
3318
3362
|
...basePredefinedVariables,
|
|
3319
3363
|
ENV_SHORT: "local",
|
|
3320
|
-
ROOT_URL: url,
|
|
3321
|
-
HOSTNAME: host,
|
|
3322
|
-
HOSTNAME_INTERNAL: host,
|
|
3323
|
-
ROOT_URL_INTERNAL: "http://" + host,
|
|
3324
|
-
PORT: port.toString(),
|
|
3364
|
+
...(url ? { ROOT_URL: url } : {}),
|
|
3365
|
+
...(host ? { HOSTNAME: host } : {}),
|
|
3366
|
+
...(host ? { HOSTNAME_INTERNAL: host } : {}),
|
|
3367
|
+
...(host ? { ROOT_URL_INTERNAL: "http://" + host } : {}),
|
|
3368
|
+
...(port ? { PORT: port.toString() } : {}),
|
|
3325
3369
|
};
|
|
3326
3370
|
}
|
|
3327
3371
|
else {
|
|
@@ -3568,7 +3612,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
|
3568
3612
|
exports.BASE_RETRY = void 0;
|
|
3569
3613
|
exports.BASE_RETRY = {
|
|
3570
3614
|
max: 2,
|
|
3571
|
-
when: ["runner_system_failure", "stuck_or_timeout_failure"],
|
|
3572
3615
|
};
|
|
3573
3616
|
//# sourceMappingURL=index.js.map
|
|
3574
3617
|
|
|
@@ -6566,17 +6566,17 @@ const getEnvironmentVariables = async (ctx, options = {}) => {
|
|
|
6566
6566
|
let url;
|
|
6567
6567
|
if (envType === "local") {
|
|
6568
6568
|
const devLocalConfig = envConfigRaw;
|
|
6569
|
-
const port = (_a = devLocalConfig.port) !== null && _a !== void 0 ? _a : 3000;
|
|
6570
|
-
host = "localhost:" + port.toString();
|
|
6571
|
-
url = "http://" + host;
|
|
6569
|
+
const port = devLocalConfig.port !== false ? ((_a = devLocalConfig.port) !== null && _a !== void 0 ? _a : 3000) : null;
|
|
6570
|
+
host = port ? "localhost:" + port.toString() : null;
|
|
6571
|
+
url = host ? "http://" + host : null;
|
|
6572
6572
|
predefinedVariables = {
|
|
6573
6573
|
...basePredefinedVariables,
|
|
6574
6574
|
ENV_SHORT: "local",
|
|
6575
|
-
ROOT_URL: url,
|
|
6576
|
-
HOSTNAME: host,
|
|
6577
|
-
HOSTNAME_INTERNAL: host,
|
|
6578
|
-
ROOT_URL_INTERNAL: "http://" + host,
|
|
6579
|
-
PORT: port.toString(),
|
|
6575
|
+
...(url ? { ROOT_URL: url } : {}),
|
|
6576
|
+
...(host ? { HOSTNAME: host } : {}),
|
|
6577
|
+
...(host ? { HOSTNAME_INTERNAL: host } : {}),
|
|
6578
|
+
...(host ? { ROOT_URL_INTERNAL: "http://" + host } : {}),
|
|
6579
|
+
...(port ? { PORT: port.toString() } : {}),
|
|
6580
6580
|
};
|
|
6581
6581
|
}
|
|
6582
6582
|
else {
|
|
@@ -6823,7 +6823,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
|
6823
6823
|
exports.BASE_RETRY = void 0;
|
|
6824
6824
|
exports.BASE_RETRY = {
|
|
6825
6825
|
max: 2,
|
|
6826
|
-
when: ["runner_system_failure", "stuck_or_timeout_failure"],
|
|
6827
6826
|
};
|
|
6828
6827
|
//# sourceMappingURL=index.js.map
|
|
6829
6828
|
|
|
@@ -2,16 +2,20 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const getProjectConfig_1 = require("../../config/getProjectConfig");
|
|
4
4
|
const printVariables_1 = require("./printVariables");
|
|
5
|
+
const verboseBanner_1 = require("./verboseBanner");
|
|
5
6
|
const writeDotEnvFiles_1 = require("./writeDotEnvFiles");
|
|
6
7
|
const writeEnvDTs_1 = require("./writeEnvDTs");
|
|
7
8
|
const pipeline_1 = require("../../../../pipeline/src/index.js");
|
|
8
|
-
exports.default = async (choice) => {
|
|
9
|
+
exports.default = async (choice, options) => {
|
|
9
10
|
var _a;
|
|
10
11
|
const config = await (0, getProjectConfig_1.getProjectConfig)();
|
|
11
12
|
if (!config) {
|
|
12
13
|
return;
|
|
13
14
|
}
|
|
14
15
|
const context = (0, pipeline_1.createCatenvContext)(config);
|
|
16
|
+
if (options === null || options === void 0 ? void 0 : options.verbose) {
|
|
17
|
+
(0, verboseBanner_1.printVerboseBanner)();
|
|
18
|
+
}
|
|
15
19
|
await Promise.all([
|
|
16
20
|
(0, pipeline_1.generatePipelineFiles)(context, (_a = config.pipelineType) !== null && _a !== void 0 ? _a : "gitlab"),
|
|
17
21
|
(0, writeDotEnvFiles_1.writeDotEnvFiles)(context, choice),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../../../src/apps/catenv/catenv.ts"],"names":[],"mappings":";;AAAA,oEAAiE;AACjE,qDAAkD;AAElD,yDAAsD;AACtD,+CAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../../../src/apps/catenv/catenv.ts"],"names":[],"mappings":";;AAAA,oEAAiE;AACjE,qDAAkD;AAElD,mDAAqD;AACrD,yDAAsD;AACtD,+CAA8C;AAC9C,kDAG6B;AAK7B,kBAAe,KAAK,EAAE,MAAe,EAAE,OAAiB,EAAE,EAAE;;IAC1D,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAgB,GAAE,CAAC;IACxC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,8BAAmB,EAAC,MAAM,CAAC,CAAC;IAC5C,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,EAAE,CAAC;QACrB,IAAA,kCAAkB,GAAE,CAAC;IACvB,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,IAAA,gCAAqB,EAAC,OAAO,EAAE,MAAA,MAAM,CAAC,YAAY,mCAAI,QAAQ,CAAC;QAC/D,IAAA,mCAAgB,EAAC,OAAO,EAAE,MAAM,CAAC;QAEjC,IAAA,2BAAa,EAAC,OAAO,EAAE,MAAM,CAAC;QAE9B,IAAA,+BAAc,EAAC,OAAO,EAAE,MAAM,CAAC;KAChC,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const printVerboseBanner: () => Promise<void>;
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.printVerboseBanner = void 0;
|
|
4
|
+
const getProjectConfig_1 = require("../../config/getProjectConfig");
|
|
5
|
+
const printVerboseBanner = async () => {
|
|
6
|
+
const config = await (0, getProjectConfig_1.getProjectConfig)();
|
|
7
|
+
if (!config) {
|
|
8
|
+
return;
|
|
9
|
+
}
|
|
10
|
+
const allCompontsWithPorts = await Promise.all(Object.keys(config.components).map(async (componentName) => {
|
|
11
|
+
const environment = await (0, getProjectConfig_1.getEnvironment)("local", componentName);
|
|
12
|
+
const port = environment.envVars.PORT;
|
|
13
|
+
if (!port) {
|
|
14
|
+
return null;
|
|
15
|
+
}
|
|
16
|
+
return `${componentName}: http://localhost:${port}`;
|
|
17
|
+
})).then((lines) => lines.filter(Boolean));
|
|
18
|
+
const lines = [
|
|
19
|
+
"catenv",
|
|
20
|
+
"-------",
|
|
21
|
+
"running on:",
|
|
22
|
+
"",
|
|
23
|
+
...allCompontsWithPorts,
|
|
24
|
+
];
|
|
25
|
+
for (const line of lines) {
|
|
26
|
+
console.log(line);
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
exports.printVerboseBanner = printVerboseBanner;
|
|
30
|
+
//# sourceMappingURL=verboseBanner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"verboseBanner.js","sourceRoot":"","sources":["../../../../../src/apps/catenv/verboseBanner.ts"],"names":[],"mappings":";;;AAAA,oEAGuC;AAEhC,MAAM,kBAAkB,GAAG,KAAK,IAAI,EAAE;IAC3C,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAgB,GAAE,CAAC;IACxC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,MAAM,oBAAoB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC5C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;QACzD,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAc,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QACjE,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;QACtC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,GAAG,aAAa,sBAAsB,IAAI,EAAE,CAAC;IACtD,CAAC,CAAC,CACH,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAEzC,MAAM,KAAK,GAAG;QACZ,QAAQ;QACR,SAAS;QACT,aAAa;QACb,EAAE;QACF,GAAG,oBAAoB;KACxB,CAAC;IACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;AACH,CAAC,CAAC;AA3BW,QAAA,kBAAkB,sBA2B7B"}
|
package/dist/cli/src/catenv.js
CHANGED
|
@@ -9,10 +9,13 @@ const args = process.argv.slice(2);
|
|
|
9
9
|
const helpFlags = ["--help", "-h", "help"];
|
|
10
10
|
if (args.some((arg) => helpFlags.includes(arg))) {
|
|
11
11
|
const docLink = "https://git.panter.ch/catladder/catladder/-/blob/main/docs/1_VARS.md";
|
|
12
|
-
console.log(`\nUsage: catenv [env|env:component]\n\nEnv variable and catenv documentation:\n${docLink}`);
|
|
12
|
+
console.log(`\nUsage: catenv [env|env:component] [-v|--verbose]\n\nEnv variable and catenv documentation:\n${docLink}`);
|
|
13
13
|
process.exit(0);
|
|
14
14
|
}
|
|
15
|
-
|
|
15
|
+
const verbose = args.some((arg) => arg === "-v" || arg === "--verbose");
|
|
16
|
+
// choise arg is deprecated and will be removed in the future
|
|
17
|
+
const choiceArg = args.find((arg) => arg !== "-v" && arg !== "--verbose");
|
|
18
|
+
(0, catenv_1.default)(choiceArg ? (0, parseChoice_1.parseChoice)(choiceArg) : null, { verbose }).then(() => {
|
|
16
19
|
// we have to exit manually, because we have some file watches
|
|
17
20
|
process.exit();
|
|
18
21
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../src/catenv.ts"],"names":[],"mappings":";;;;;AAAA,kEAA0C;AAE1C,sDAAmD;AAEnD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEnC,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AAC3C,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;IAChD,MAAM,OAAO,GACX,sEAAsE,CAAC;IACzE,OAAO,CAAC,GAAG,CACT,
|
|
1
|
+
{"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../src/catenv.ts"],"names":[],"mappings":";;;;;AAAA,kEAA0C;AAE1C,sDAAmD;AAEnD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEnC,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AAC3C,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;IAChD,MAAM,OAAO,GACX,sEAAsE,CAAC;IACzE,OAAO,CAAC,GAAG,CACT,iGAAiG,OAAO,EAAE,CAC3G,CAAC;IACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,WAAW,CAAC,CAAC;AACxE,6DAA6D;AAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,WAAW,CAAC,CAAC;AAE1E,IAAA,gBAAM,EAAC,SAAS,CAAC,CAAC,CAAC,IAAA,yBAAW,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;IACvE,8DAA8D;IAC9D,OAAO,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC,CAAC,CAAC"}
|
|
@@ -13,10 +13,10 @@ declare const getBasePredefinedVariables: (ctx: EnvironmentContext) => {
|
|
|
13
13
|
};
|
|
14
14
|
type BasePredefinedVariables = ReturnType<typeof getBasePredefinedVariables>;
|
|
15
15
|
export type PredefinedVariables = BasePredefinedVariables & {
|
|
16
|
-
HOSTNAME
|
|
17
|
-
ROOT_URL
|
|
18
|
-
HOSTNAME_INTERNAL
|
|
19
|
-
ROOT_URL_INTERNAL
|
|
16
|
+
HOSTNAME?: StringOrBashExpression;
|
|
17
|
+
ROOT_URL?: StringOrBashExpression;
|
|
18
|
+
HOSTNAME_INTERNAL?: StringOrBashExpression;
|
|
19
|
+
ROOT_URL_INTERNAL?: StringOrBashExpression;
|
|
20
20
|
};
|
|
21
21
|
export declare const getEnvironmentVariables: (ctx: CreateComponentContextContext, options?: {
|
|
22
22
|
shouldResolveReferences?: boolean;
|
|
@@ -29,17 +29,17 @@ const getEnvironmentVariables = async (ctx, options = {}) => {
|
|
|
29
29
|
let url;
|
|
30
30
|
if (envType === "local") {
|
|
31
31
|
const devLocalConfig = envConfigRaw;
|
|
32
|
-
const port = (_a = devLocalConfig.port) !== null && _a !== void 0 ? _a : 3000;
|
|
33
|
-
host = "localhost:" + port.toString();
|
|
34
|
-
url = "http://" + host;
|
|
32
|
+
const port = devLocalConfig.port !== false ? ((_a = devLocalConfig.port) !== null && _a !== void 0 ? _a : 3000) : null;
|
|
33
|
+
host = port ? "localhost:" + port.toString() : null;
|
|
34
|
+
url = host ? "http://" + host : null;
|
|
35
35
|
predefinedVariables = {
|
|
36
36
|
...basePredefinedVariables,
|
|
37
37
|
ENV_SHORT: "local",
|
|
38
|
-
ROOT_URL: url,
|
|
39
|
-
HOSTNAME: host,
|
|
40
|
-
HOSTNAME_INTERNAL: host,
|
|
41
|
-
ROOT_URL_INTERNAL: "http://" + host,
|
|
42
|
-
PORT: port.toString(),
|
|
38
|
+
...(url ? { ROOT_URL: url } : {}),
|
|
39
|
+
...(host ? { HOSTNAME: host } : {}),
|
|
40
|
+
...(host ? { HOSTNAME_INTERNAL: host } : {}),
|
|
41
|
+
...(host ? { ROOT_URL_INTERNAL: "http://" + host } : {}),
|
|
42
|
+
...(port ? { PORT: port.toString() } : {}),
|
|
43
43
|
};
|
|
44
44
|
}
|
|
45
45
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getEnvironmentVariables.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/getEnvironmentVariables.ts"],"names":[],"mappings":";;;AAAA,sCAAyC;AASzC,2DAA6D;AAC7D,0CAAyD;AAEzD,sGAAmH;AACnH,4EAAyE;AACzE,mEAAgE;AAChE,mEAAgE;AAChE,iEAA8D;AAC9D,6CAIyB;AAQzB,MAAM,0BAA0B,GAAG,CAAC,GAAuB,EAAE,EAAE;IAC7D,OAAO;QACL,SAAS,EAAE,GAAG,CAAC,GAAG;QAClB,OAAO,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG;QAC7B,QAAQ,EAAE,GAAG,CAAC,OAAO;QACrB,GAAG,CAAC,GAAG,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,IAAA,6CAAqB,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/D,CAAC;AACJ,CAAC,CAAC;AAYK,MAAM,uBAAuB,GAAG,KAAK,EAC1C,GAAkC,EAClC,UAAiD,EAAE,EACpB,EAAE;;IACjC,MAAM,kBAAkB,GAAG,IAAA,6CAAqB,EAAC,GAAG,CAAC,CAAC;IAEtD,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC;IAC3C,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,OAAO,EAAE,GAC9D,kBAAkB,CAAC;IAErB,MAAM,uBAAuB,GAC3B,0BAA0B,CAAC,kBAAkB,CAAC,CAAC;IAEjD,IAAI,mBAA6D,CAAC;IAClE,IAAI,
|
|
1
|
+
{"version":3,"file":"getEnvironmentVariables.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/getEnvironmentVariables.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/defaults/index.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAU;IAC/B,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/defaults/index.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAU;IAC/B,GAAG,EAAE,CAAC;CACP,CAAC"}
|
|
@@ -74,7 +74,11 @@ export type DefaultEnvConfig = {
|
|
|
74
74
|
};
|
|
75
75
|
export type DevLocalEnvConfig = {
|
|
76
76
|
vars?: EnvVars;
|
|
77
|
-
|
|
77
|
+
/**
|
|
78
|
+
* port that is used. If not set, 3000 is used.
|
|
79
|
+
* set false to not set a port at all
|
|
80
|
+
*/
|
|
81
|
+
port?: number | false;
|
|
78
82
|
};
|
|
79
83
|
type AddOverrideFunction<T> = {
|
|
80
84
|
[K in keyof T]: T[K] | ((defaultValue: T[K]) => T[K]) | (T[K] extends Record<string, unknown> | undefined ? AddOverrideFunction<T[K]> : never);
|