@common-stack/rollup-vite-utils 8.5.1-alpha.1 → 8.5.1-alpha.2
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/lib/default-config.json.cjs +1 -1
- package/lib/default-config.json.js +1 -1
- package/lib/preStartup/configLoader/configLoader.cjs +31 -9
- package/lib/preStartup/configLoader/configLoader.cjs.map +1 -1
- package/lib/preStartup/configLoader/configLoader.js +31 -9
- package/lib/preStartup/configLoader/configLoader.js.map +1 -1
- package/package.json +2 -2
|
@@ -53,7 +53,7 @@ var buildConfig = {
|
|
|
53
53
|
__SSR__: "$.env.SSR|true",
|
|
54
54
|
__API_URL__: "$.env.GRAPHQL_URL|'http://localhost:8080/graphql'",
|
|
55
55
|
__FRONTEND_BUILD_DIR__: "$.env.FRONTEND_BUILD_DIR|'./dist/client'",
|
|
56
|
-
__WEB_DEV_SERVER_PORT__: "$.env.CLIENT_URL.url.port|'3000'",
|
|
56
|
+
__WEB_DEV_SERVER_PORT__: "$.env.CLIENT_URL.url.port|$.env.LOCAL_CLIENT_URL.url.port|'3000'",
|
|
57
57
|
__GRAPHQL_ENDPOINT__: "$.env.GRAPHQL_URL.url.pathname|'/graphql'",
|
|
58
58
|
__LOCAL_SERVER_HOST__: "$.env.CLIENT_URL.url.hostname|'localhost'",
|
|
59
59
|
__BACKEND_URL__: "$.env.BACKEND_URL|'http://localhost:8080'"
|
|
@@ -53,7 +53,7 @@ var buildConfig = {
|
|
|
53
53
|
__SSR__: "$.env.SSR|true",
|
|
54
54
|
__API_URL__: "$.env.GRAPHQL_URL|'http://localhost:8080/graphql'",
|
|
55
55
|
__FRONTEND_BUILD_DIR__: "$.env.FRONTEND_BUILD_DIR|'./dist/client'",
|
|
56
|
-
__WEB_DEV_SERVER_PORT__: "$.env.CLIENT_URL.url.port|'3000'",
|
|
56
|
+
__WEB_DEV_SERVER_PORT__: "$.env.CLIENT_URL.url.port|$.env.LOCAL_CLIENT_URL.url.port|'3000'",
|
|
57
57
|
__GRAPHQL_ENDPOINT__: "$.env.GRAPHQL_URL.url.pathname|'/graphql'",
|
|
58
58
|
__LOCAL_SERVER_HOST__: "$.env.CLIENT_URL.url.hostname|'localhost'",
|
|
59
59
|
__BACKEND_URL__: "$.env.BACKEND_URL|'http://localhost:8080'"
|
|
@@ -1,29 +1,51 @@
|
|
|
1
1
|
'use strict';var fs=require('fs-extra'),path=require('path'),glob=require('glob'),copyIfVersionChanged=require('../copyIfVersionChanged.cjs'),utils=require('../../utils/utils.cjs');require('fs'),require('ajv');function resolvePath(config, path) {
|
|
2
|
-
if (typeof path
|
|
3
|
-
|
|
2
|
+
if (typeof path !== 'string') {
|
|
3
|
+
return path;
|
|
4
|
+
}
|
|
5
|
+
// Split on '|' to support chained fallbacks (e.g. $.env.X.url.port|$.env.Y.url.port|'3000')
|
|
6
|
+
const segments = path.split('|');
|
|
7
|
+
for (let i = 0; i < segments.length; i++) {
|
|
8
|
+
const segment = segments[i].trim();
|
|
9
|
+
const isLastSegment = i === segments.length - 1;
|
|
10
|
+
// If the segment is a literal default value (not a $ expression), return it
|
|
11
|
+
if (!segment.startsWith('$.')) {
|
|
12
|
+
// Strip surrounding quotes from literal defaults
|
|
13
|
+
return segment.replace(/^['"]|['"]$/g, '');
|
|
14
|
+
}
|
|
15
|
+
const parts = segment.split('.').slice(1); // Remove the leading '$.'
|
|
4
16
|
if (parts[0] === 'env') {
|
|
5
|
-
const
|
|
17
|
+
const envVar = parts[1];
|
|
6
18
|
const envValue = process.env[envVar];
|
|
7
|
-
if (!envValue
|
|
19
|
+
if (!envValue) {
|
|
20
|
+
// If env var is not set and there are more fallbacks, try the next one
|
|
21
|
+
if (!isLastSegment) {
|
|
22
|
+
continue;
|
|
23
|
+
}
|
|
8
24
|
throw new Error(`Environment variable ${envVar} is not provided`);
|
|
9
25
|
}
|
|
10
|
-
const resolvedValue = envValue || defaultValue; // Use envValue or defaultValue if provided
|
|
11
26
|
if (parts[2] === 'url') {
|
|
12
27
|
try {
|
|
13
|
-
const url = new URL(
|
|
28
|
+
const url = new URL(envValue);
|
|
14
29
|
if (parts[3] === 'pathname') {
|
|
15
30
|
return url.pathname;
|
|
16
31
|
}
|
|
17
32
|
if (parts[3] === 'port') {
|
|
18
|
-
|
|
33
|
+
// If port is empty (e.g. https://app.example.com), try next fallback
|
|
34
|
+
if (!url.port && !isLastSegment) {
|
|
35
|
+
continue;
|
|
36
|
+
}
|
|
37
|
+
return url.port || '80'; // Default to port 80 if no more fallbacks
|
|
19
38
|
}
|
|
20
|
-
return
|
|
39
|
+
return envValue;
|
|
21
40
|
}
|
|
22
41
|
catch (error) {
|
|
42
|
+
if (!isLastSegment) {
|
|
43
|
+
continue;
|
|
44
|
+
}
|
|
23
45
|
throw new Error(`Invalid URL provided in environment variable ${envVar}`);
|
|
24
46
|
}
|
|
25
47
|
}
|
|
26
|
-
return
|
|
48
|
+
return envValue;
|
|
27
49
|
}
|
|
28
50
|
// Handle regular config path resolution
|
|
29
51
|
const result = parts.reduce((o, p) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configLoader.cjs","sources":["../../../src/preStartup/configLoader/configLoader.ts"],"sourcesContent":[null],"names":["findPackageDir","glob","copyIfVersionChanged"],"mappings":"kNAMgB,SAAA,WAAW,CAAC,MAAM,EAAE,IAAI,EAAA;AACpC,IAAA,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"configLoader.cjs","sources":["../../../src/preStartup/configLoader/configLoader.ts"],"sourcesContent":[null],"names":["findPackageDir","glob","copyIfVersionChanged"],"mappings":"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"}
|
|
@@ -1,29 +1,51 @@
|
|
|
1
1
|
import fs from'fs-extra';import path__default from'path';import {glob}from'glob';import {copyIfVersionChanged}from'../copyIfVersionChanged.js';import {findPackageDir}from'../../utils/utils.js';import'fs';import'ajv';function resolvePath(config, path) {
|
|
2
|
-
if (typeof path
|
|
3
|
-
|
|
2
|
+
if (typeof path !== 'string') {
|
|
3
|
+
return path;
|
|
4
|
+
}
|
|
5
|
+
// Split on '|' to support chained fallbacks (e.g. $.env.X.url.port|$.env.Y.url.port|'3000')
|
|
6
|
+
const segments = path.split('|');
|
|
7
|
+
for (let i = 0; i < segments.length; i++) {
|
|
8
|
+
const segment = segments[i].trim();
|
|
9
|
+
const isLastSegment = i === segments.length - 1;
|
|
10
|
+
// If the segment is a literal default value (not a $ expression), return it
|
|
11
|
+
if (!segment.startsWith('$.')) {
|
|
12
|
+
// Strip surrounding quotes from literal defaults
|
|
13
|
+
return segment.replace(/^['"]|['"]$/g, '');
|
|
14
|
+
}
|
|
15
|
+
const parts = segment.split('.').slice(1); // Remove the leading '$.'
|
|
4
16
|
if (parts[0] === 'env') {
|
|
5
|
-
const
|
|
17
|
+
const envVar = parts[1];
|
|
6
18
|
const envValue = process.env[envVar];
|
|
7
|
-
if (!envValue
|
|
19
|
+
if (!envValue) {
|
|
20
|
+
// If env var is not set and there are more fallbacks, try the next one
|
|
21
|
+
if (!isLastSegment) {
|
|
22
|
+
continue;
|
|
23
|
+
}
|
|
8
24
|
throw new Error(`Environment variable ${envVar} is not provided`);
|
|
9
25
|
}
|
|
10
|
-
const resolvedValue = envValue || defaultValue; // Use envValue or defaultValue if provided
|
|
11
26
|
if (parts[2] === 'url') {
|
|
12
27
|
try {
|
|
13
|
-
const url = new URL(
|
|
28
|
+
const url = new URL(envValue);
|
|
14
29
|
if (parts[3] === 'pathname') {
|
|
15
30
|
return url.pathname;
|
|
16
31
|
}
|
|
17
32
|
if (parts[3] === 'port') {
|
|
18
|
-
|
|
33
|
+
// If port is empty (e.g. https://app.example.com), try next fallback
|
|
34
|
+
if (!url.port && !isLastSegment) {
|
|
35
|
+
continue;
|
|
36
|
+
}
|
|
37
|
+
return url.port || '80'; // Default to port 80 if no more fallbacks
|
|
19
38
|
}
|
|
20
|
-
return
|
|
39
|
+
return envValue;
|
|
21
40
|
}
|
|
22
41
|
catch (error) {
|
|
42
|
+
if (!isLastSegment) {
|
|
43
|
+
continue;
|
|
44
|
+
}
|
|
23
45
|
throw new Error(`Invalid URL provided in environment variable ${envVar}`);
|
|
24
46
|
}
|
|
25
47
|
}
|
|
26
|
-
return
|
|
48
|
+
return envValue;
|
|
27
49
|
}
|
|
28
50
|
// Handle regular config path resolution
|
|
29
51
|
const result = parts.reduce((o, p) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configLoader.js","sources":["../../../src/preStartup/configLoader/configLoader.ts"],"sourcesContent":[null],"names":["path"],"mappings":"wNAMgB,SAAA,WAAW,CAAC,MAAM,EAAE,IAAI,EAAA;AACpC,IAAA,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"configLoader.js","sources":["../../../src/preStartup/configLoader/configLoader.ts"],"sourcesContent":[null],"names":["path"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@common-stack/rollup-vite-utils",
|
|
3
|
-
"version": "8.5.1-alpha.
|
|
3
|
+
"version": "8.5.1-alpha.2",
|
|
4
4
|
"description": "Client Module for react app",
|
|
5
5
|
"homepage": "https://github.com/cdmbase/fullstack-pro#readme",
|
|
6
6
|
"bugs": {
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"publishConfig": {
|
|
63
63
|
"access": "public"
|
|
64
64
|
},
|
|
65
|
-
"gitHead": "
|
|
65
|
+
"gitHead": "f163a83bf637a424d5891c4d1dbf007e9ec86a72",
|
|
66
66
|
"typescript": {
|
|
67
67
|
"definition": "lib/index.d.ts"
|
|
68
68
|
}
|