@common-stack/rollup-vite-utils 6.0.8-alpha.38 → 6.0.8-alpha.48
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.
|
@@ -3,71 +3,87 @@
|
|
|
3
3
|
// ESM-compatible require
|
|
4
4
|
const esmRequire = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('tools/codegen/readModules.cjs', document.baseURI).href)));
|
|
5
5
|
/**
|
|
6
|
-
* Reads modules from
|
|
7
|
-
*
|
|
8
|
-
*
|
|
6
|
+
* Reads modules from JSON config files and returns an array of module objects.
|
|
7
|
+
*
|
|
8
|
+
* The function separates modules into client and server arrays based on the suffix (“-server”),
|
|
9
|
+
* then it attempts to resolve each module’s location. If the resolution fails—often due to a missing
|
|
10
|
+
* "lib" folder on external packages—it falls back by removing any `/lib` reference from the module name.
|
|
11
|
+
*
|
|
12
|
+
* For local modules it always returns an object with { client, core, browser, server } keys.
|
|
13
|
+
* For modules from node_modules, it generates paths based on naming conventions.
|
|
9
14
|
*/
|
|
10
15
|
function readModules(serverConfigPaths = []) {
|
|
11
|
-
//
|
|
16
|
+
// Separate client and server modules while loading the JSON config files.
|
|
12
17
|
const [clientModules, serverModules] = serverConfigPaths.reduce((acc, configFile) => {
|
|
13
18
|
if (!fs.existsSync(configFile)) {
|
|
14
19
|
console.error(`Config file not found: ${configFile}`);
|
|
15
20
|
process.exit(1);
|
|
16
21
|
}
|
|
17
22
|
const configData = JSON.parse(fs.readFileSync(configFile, 'utf-8'));
|
|
18
|
-
// Process regular modules
|
|
19
|
-
configData.modules?.forEach((
|
|
20
|
-
if (
|
|
21
|
-
acc[1].push(
|
|
23
|
+
// Process regular modules.
|
|
24
|
+
configData.modules?.forEach((mod) => {
|
|
25
|
+
if (mod.endsWith('-server')) {
|
|
26
|
+
acc[1].push(mod);
|
|
22
27
|
}
|
|
23
28
|
else {
|
|
24
|
-
acc[0].push(
|
|
29
|
+
acc[0].push(mod);
|
|
25
30
|
}
|
|
26
31
|
});
|
|
27
|
-
// Process external modules
|
|
28
|
-
configData.externalModules?.forEach((
|
|
29
|
-
if (
|
|
30
|
-
acc[1].push(
|
|
32
|
+
// Process external modules.
|
|
33
|
+
configData.externalModules?.forEach((mod) => {
|
|
34
|
+
if (mod.endsWith('-server')) {
|
|
35
|
+
acc[1].push(mod);
|
|
31
36
|
}
|
|
32
37
|
else {
|
|
33
|
-
acc[0].push(
|
|
38
|
+
acc[0].push(mod);
|
|
34
39
|
}
|
|
35
40
|
});
|
|
36
|
-
//
|
|
37
|
-
configData.devModules?.forEach((
|
|
38
|
-
if (
|
|
39
|
-
acc[1].push(
|
|
41
|
+
// Process devModules.
|
|
42
|
+
configData.devModules?.forEach((mod) => {
|
|
43
|
+
if (mod.endsWith('-server')) {
|
|
44
|
+
acc[1].push(mod);
|
|
40
45
|
}
|
|
41
46
|
else {
|
|
42
|
-
acc[0].push(
|
|
47
|
+
acc[0].push(mod);
|
|
43
48
|
}
|
|
44
49
|
});
|
|
45
50
|
return acc;
|
|
46
51
|
}, [[], []]);
|
|
47
|
-
//
|
|
52
|
+
// Combine modules uniquely
|
|
48
53
|
const allModules = [...new Set([...clientModules, ...serverModules])];
|
|
49
|
-
// 3) Transform each moduleName into a module object
|
|
50
54
|
const processedModules = new Set();
|
|
51
55
|
return allModules.reduce((acc, moduleName) => {
|
|
52
56
|
try {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
57
|
+
let resolvedFile;
|
|
58
|
+
try {
|
|
59
|
+
// Attempt normal resolution.
|
|
60
|
+
resolvedFile = esmRequire.resolve(moduleName);
|
|
61
|
+
}
|
|
62
|
+
catch (err) {
|
|
63
|
+
// Fallback resolution: if the module name includes "/lib", remove it and try again.
|
|
64
|
+
const fallbackModule = moduleName.includes('/lib') ? moduleName.replace(/\/lib.*$/, '') : moduleName;
|
|
65
|
+
try {
|
|
66
|
+
resolvedFile = esmRequire.resolve(fallbackModule);
|
|
67
|
+
}
|
|
68
|
+
catch (err2) {
|
|
69
|
+
console.warn(`Could not resolve module ${moduleName} even with fallback ${fallbackModule}. Skipping.`);
|
|
70
|
+
return acc;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
const dirName = path.dirname(resolvedFile);
|
|
56
74
|
const modulePath = path.relative(commonPaths.pathsConfig.repoRoot, dirName);
|
|
57
|
-
// Reverse
|
|
75
|
+
// Reverse the split parts to check if "node_modules" exists.
|
|
58
76
|
const [dir, pkg, ...rest] = modulePath.split('/').reverse();
|
|
59
77
|
const isLocal = !rest.includes('node_modules');
|
|
60
|
-
// For local modules, baseModule might be "packages-modules/foo";
|
|
61
|
-
// For node_modules, it's something like "node_modules/some-lib"
|
|
62
78
|
const baseModule = isLocal ? [...rest].reverse().join('/') : modulePath.replace('/lib', '');
|
|
63
79
|
if (processedModules.has(baseModule)) {
|
|
64
80
|
return acc;
|
|
65
81
|
}
|
|
66
82
|
processedModules.add(baseModule);
|
|
67
|
-
//
|
|
83
|
+
// For local modules, use "src" directory; for node_modules, use "lib"
|
|
68
84
|
const srcOrLib = isLocal ? 'src' : 'lib';
|
|
69
85
|
const generatePath = (type) => `${baseModule}${isLocal ? `/${type}` : ''}/${srcOrLib}`;
|
|
70
|
-
//
|
|
86
|
+
// For local modules, always return all module keys.
|
|
71
87
|
if (isLocal) {
|
|
72
88
|
return [
|
|
73
89
|
...acc,
|
|
@@ -79,10 +95,9 @@ function readModules(serverConfigPaths = []) {
|
|
|
79
95
|
},
|
|
80
96
|
];
|
|
81
97
|
}
|
|
82
|
-
//
|
|
83
|
-
// If the baseModule ends with "-browser"
|
|
98
|
+
// Otherwise, handle node_module naming conventions.
|
|
99
|
+
// If the baseModule ends with "-browser".
|
|
84
100
|
if (baseModule.endsWith('-browser')) {
|
|
85
|
-
// If it ends with -browser, also provide -client, -core
|
|
86
101
|
return [
|
|
87
102
|
...acc,
|
|
88
103
|
{
|
|
@@ -93,7 +108,6 @@ function readModules(serverConfigPaths = []) {
|
|
|
93
108
|
];
|
|
94
109
|
}
|
|
95
110
|
if (baseModule.endsWith('-server')) {
|
|
96
|
-
// If it ends with -server
|
|
97
111
|
return [
|
|
98
112
|
...acc,
|
|
99
113
|
{
|
|
@@ -102,7 +116,6 @@ function readModules(serverConfigPaths = []) {
|
|
|
102
116
|
];
|
|
103
117
|
}
|
|
104
118
|
if (baseModule.includes('-browser')) {
|
|
105
|
-
// If it has '-browser' somewhere else
|
|
106
119
|
return [
|
|
107
120
|
...acc,
|
|
108
121
|
{
|
|
@@ -110,7 +123,7 @@ function readModules(serverConfigPaths = []) {
|
|
|
110
123
|
},
|
|
111
124
|
];
|
|
112
125
|
}
|
|
113
|
-
// Default fallback
|
|
126
|
+
// Default fallback.
|
|
114
127
|
return [
|
|
115
128
|
...acc,
|
|
116
129
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readModules.cjs","sources":["../../../src/tools/codegen/readModules.ts"],"sourcesContent":[null],"names":["createRequire","pathsConfig"],"mappings":"8MAKA;AACA;AAEA;AACA,MAAM,UAAU,GAAGA,sBAAa,CAAC,+QAAe,CAAC,CAAC;AAElD
|
|
1
|
+
{"version":3,"file":"readModules.cjs","sources":["../../../src/tools/codegen/readModules.ts"],"sourcesContent":[null],"names":["createRequire","pathsConfig"],"mappings":"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"}
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Reads modules from
|
|
3
|
-
*
|
|
4
|
-
*
|
|
2
|
+
* Reads modules from JSON config files and returns an array of module objects.
|
|
3
|
+
*
|
|
4
|
+
* The function separates modules into client and server arrays based on the suffix (“-server”),
|
|
5
|
+
* then it attempts to resolve each module’s location. If the resolution fails—often due to a missing
|
|
6
|
+
* "lib" folder on external packages—it falls back by removing any `/lib` reference from the module name.
|
|
7
|
+
*
|
|
8
|
+
* For local modules it always returns an object with { client, core, browser, server } keys.
|
|
9
|
+
* For modules from node_modules, it generates paths based on naming conventions.
|
|
5
10
|
*/
|
|
6
|
-
export declare function readModules(serverConfigPaths?:
|
|
11
|
+
export declare function readModules(serverConfigPaths?: string[]): any[];
|
|
@@ -3,71 +3,87 @@ import fs__default from'fs';import path__default from'path';import {createRequir
|
|
|
3
3
|
// ESM-compatible require
|
|
4
4
|
const esmRequire = createRequire(import.meta.url);
|
|
5
5
|
/**
|
|
6
|
-
* Reads modules from
|
|
7
|
-
*
|
|
8
|
-
*
|
|
6
|
+
* Reads modules from JSON config files and returns an array of module objects.
|
|
7
|
+
*
|
|
8
|
+
* The function separates modules into client and server arrays based on the suffix (“-server”),
|
|
9
|
+
* then it attempts to resolve each module’s location. If the resolution fails—often due to a missing
|
|
10
|
+
* "lib" folder on external packages—it falls back by removing any `/lib` reference from the module name.
|
|
11
|
+
*
|
|
12
|
+
* For local modules it always returns an object with { client, core, browser, server } keys.
|
|
13
|
+
* For modules from node_modules, it generates paths based on naming conventions.
|
|
9
14
|
*/
|
|
10
15
|
function readModules(serverConfigPaths = []) {
|
|
11
|
-
//
|
|
16
|
+
// Separate client and server modules while loading the JSON config files.
|
|
12
17
|
const [clientModules, serverModules] = serverConfigPaths.reduce((acc, configFile) => {
|
|
13
18
|
if (!fs__default.existsSync(configFile)) {
|
|
14
19
|
console.error(`Config file not found: ${configFile}`);
|
|
15
20
|
process.exit(1);
|
|
16
21
|
}
|
|
17
22
|
const configData = JSON.parse(fs__default.readFileSync(configFile, 'utf-8'));
|
|
18
|
-
// Process regular modules
|
|
19
|
-
configData.modules?.forEach((
|
|
20
|
-
if (
|
|
21
|
-
acc[1].push(
|
|
23
|
+
// Process regular modules.
|
|
24
|
+
configData.modules?.forEach((mod) => {
|
|
25
|
+
if (mod.endsWith('-server')) {
|
|
26
|
+
acc[1].push(mod);
|
|
22
27
|
}
|
|
23
28
|
else {
|
|
24
|
-
acc[0].push(
|
|
29
|
+
acc[0].push(mod);
|
|
25
30
|
}
|
|
26
31
|
});
|
|
27
|
-
// Process external modules
|
|
28
|
-
configData.externalModules?.forEach((
|
|
29
|
-
if (
|
|
30
|
-
acc[1].push(
|
|
32
|
+
// Process external modules.
|
|
33
|
+
configData.externalModules?.forEach((mod) => {
|
|
34
|
+
if (mod.endsWith('-server')) {
|
|
35
|
+
acc[1].push(mod);
|
|
31
36
|
}
|
|
32
37
|
else {
|
|
33
|
-
acc[0].push(
|
|
38
|
+
acc[0].push(mod);
|
|
34
39
|
}
|
|
35
40
|
});
|
|
36
|
-
//
|
|
37
|
-
configData.devModules?.forEach((
|
|
38
|
-
if (
|
|
39
|
-
acc[1].push(
|
|
41
|
+
// Process devModules.
|
|
42
|
+
configData.devModules?.forEach((mod) => {
|
|
43
|
+
if (mod.endsWith('-server')) {
|
|
44
|
+
acc[1].push(mod);
|
|
40
45
|
}
|
|
41
46
|
else {
|
|
42
|
-
acc[0].push(
|
|
47
|
+
acc[0].push(mod);
|
|
43
48
|
}
|
|
44
49
|
});
|
|
45
50
|
return acc;
|
|
46
51
|
}, [[], []]);
|
|
47
|
-
//
|
|
52
|
+
// Combine modules uniquely
|
|
48
53
|
const allModules = [...new Set([...clientModules, ...serverModules])];
|
|
49
|
-
// 3) Transform each moduleName into a module object
|
|
50
54
|
const processedModules = new Set();
|
|
51
55
|
return allModules.reduce((acc, moduleName) => {
|
|
52
56
|
try {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
57
|
+
let resolvedFile;
|
|
58
|
+
try {
|
|
59
|
+
// Attempt normal resolution.
|
|
60
|
+
resolvedFile = esmRequire.resolve(moduleName);
|
|
61
|
+
}
|
|
62
|
+
catch (err) {
|
|
63
|
+
// Fallback resolution: if the module name includes "/lib", remove it and try again.
|
|
64
|
+
const fallbackModule = moduleName.includes('/lib') ? moduleName.replace(/\/lib.*$/, '') : moduleName;
|
|
65
|
+
try {
|
|
66
|
+
resolvedFile = esmRequire.resolve(fallbackModule);
|
|
67
|
+
}
|
|
68
|
+
catch (err2) {
|
|
69
|
+
console.warn(`Could not resolve module ${moduleName} even with fallback ${fallbackModule}. Skipping.`);
|
|
70
|
+
return acc;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
const dirName = path__default.dirname(resolvedFile);
|
|
56
74
|
const modulePath = path__default.relative(pathsConfig.repoRoot, dirName);
|
|
57
|
-
// Reverse
|
|
75
|
+
// Reverse the split parts to check if "node_modules" exists.
|
|
58
76
|
const [dir, pkg, ...rest] = modulePath.split('/').reverse();
|
|
59
77
|
const isLocal = !rest.includes('node_modules');
|
|
60
|
-
// For local modules, baseModule might be "packages-modules/foo";
|
|
61
|
-
// For node_modules, it's something like "node_modules/some-lib"
|
|
62
78
|
const baseModule = isLocal ? [...rest].reverse().join('/') : modulePath.replace('/lib', '');
|
|
63
79
|
if (processedModules.has(baseModule)) {
|
|
64
80
|
return acc;
|
|
65
81
|
}
|
|
66
82
|
processedModules.add(baseModule);
|
|
67
|
-
//
|
|
83
|
+
// For local modules, use "src" directory; for node_modules, use "lib"
|
|
68
84
|
const srcOrLib = isLocal ? 'src' : 'lib';
|
|
69
85
|
const generatePath = (type) => `${baseModule}${isLocal ? `/${type}` : ''}/${srcOrLib}`;
|
|
70
|
-
//
|
|
86
|
+
// For local modules, always return all module keys.
|
|
71
87
|
if (isLocal) {
|
|
72
88
|
return [
|
|
73
89
|
...acc,
|
|
@@ -79,10 +95,9 @@ function readModules(serverConfigPaths = []) {
|
|
|
79
95
|
},
|
|
80
96
|
];
|
|
81
97
|
}
|
|
82
|
-
//
|
|
83
|
-
// If the baseModule ends with "-browser"
|
|
98
|
+
// Otherwise, handle node_module naming conventions.
|
|
99
|
+
// If the baseModule ends with "-browser".
|
|
84
100
|
if (baseModule.endsWith('-browser')) {
|
|
85
|
-
// If it ends with -browser, also provide -client, -core
|
|
86
101
|
return [
|
|
87
102
|
...acc,
|
|
88
103
|
{
|
|
@@ -93,7 +108,6 @@ function readModules(serverConfigPaths = []) {
|
|
|
93
108
|
];
|
|
94
109
|
}
|
|
95
110
|
if (baseModule.endsWith('-server')) {
|
|
96
|
-
// If it ends with -server
|
|
97
111
|
return [
|
|
98
112
|
...acc,
|
|
99
113
|
{
|
|
@@ -102,7 +116,6 @@ function readModules(serverConfigPaths = []) {
|
|
|
102
116
|
];
|
|
103
117
|
}
|
|
104
118
|
if (baseModule.includes('-browser')) {
|
|
105
|
-
// If it has '-browser' somewhere else
|
|
106
119
|
return [
|
|
107
120
|
...acc,
|
|
108
121
|
{
|
|
@@ -110,7 +123,7 @@ function readModules(serverConfigPaths = []) {
|
|
|
110
123
|
},
|
|
111
124
|
];
|
|
112
125
|
}
|
|
113
|
-
// Default fallback
|
|
126
|
+
// Default fallback.
|
|
114
127
|
return [
|
|
115
128
|
...acc,
|
|
116
129
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readModules.js","sources":["../../../src/tools/codegen/readModules.ts"],"sourcesContent":[null],"names":["fs","path"],"mappings":"0IAKA;AACA;AAEA;AACA,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAElD
|
|
1
|
+
{"version":3,"file":"readModules.js","sources":["../../../src/tools/codegen/readModules.ts"],"sourcesContent":[null],"names":["fs","path"],"mappings":"0IAKA;AACA;AAEA;AACA,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAElD;;;;;;;;;AASG;AACa,SAAA,WAAW,CAAC,iBAAA,GAA8B,EAAE,EAAA;;AAExD,IAAA,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,GAAG,iBAAiB,CAAC,MAAM,CAC3D,CAAC,GAAG,EAAE,UAAU,KAAI;QAChB,IAAI,CAACA,WAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;AAC5B,YAAA,OAAO,CAAC,KAAK,CAAC,0BAA0B,UAAU,CAAA,CAAE,CAAC,CAAC;AACtD,YAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACnB;AACD,QAAA,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAACA,WAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;;QAGpE,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,GAAW,KAAI;AACxC,YAAA,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBACzB,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;iBAAM;gBACH,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;AACL,SAAC,CAAC,CAAC;;QAGH,UAAU,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,GAAW,KAAI;AAChD,YAAA,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBACzB,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;iBAAM;gBACH,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;AACL,SAAC,CAAC,CAAC;;QAGH,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,GAAW,KAAI;AAC3C,YAAA,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBACzB,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;iBAAM;gBACH,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;AACL,SAAC,CAAC,CAAC;AAEH,QAAA,OAAO,GAAG,CAAC;AACf,KAAC,EACD,CAAC,EAAE,EAAE,EAAE,CAAyB,CACnC,CAAC;;AAGF,IAAA,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,aAAa,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;AAEtE,IAAA,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE3C,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,UAAU,KAAI;AACzC,QAAA,IAAI;AACA,YAAA,IAAI,YAAoB,CAAC;AACzB,YAAA,IAAI;;AAEA,gBAAA,YAAY,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;aACjD;YAAC,OAAO,GAAG,EAAE;;gBAEV,MAAM,cAAc,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC;AACrG,gBAAA,IAAI;AACA,oBAAA,YAAY,GAAG,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;iBACrD;gBAAC,OAAO,IAAI,EAAE;oBACX,OAAO,CAAC,IAAI,CACR,CAAA,yBAAA,EAA4B,UAAU,CAAuB,oBAAA,EAAA,cAAc,CAAa,WAAA,CAAA,CAC3F,CAAC;AACF,oBAAA,OAAO,GAAG,CAAC;iBACd;aACJ;YAED,MAAM,OAAO,GAAGC,aAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;AAC3C,YAAA,MAAM,UAAU,GAAGA,aAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;;AAGhE,YAAA,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;YAC5D,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAE/C,YAAA,MAAM,UAAU,GAAG,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAC5F,YAAA,IAAI,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;AAClC,gBAAA,OAAO,GAAG,CAAC;aACd;AACD,YAAA,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;;YAGjC,MAAM,QAAQ,GAAG,OAAO,GAAG,KAAK,GAAG,KAAK,CAAC;YACzC,MAAM,YAAY,GAAG,CAAC,IAAY,KAAK,CAAA,EAAG,UAAU,CAAA,EAAG,OAAO,GAAG,CAAA,CAAA,EAAI,IAAI,CAAA,CAAE,GAAG,EAAE,CAAA,CAAA,EAAI,QAAQ,CAAA,CAAE,CAAC;;YAG/F,IAAI,OAAO,EAAE;gBACT,OAAO;AACH,oBAAA,GAAG,GAAG;AACN,oBAAA;AACI,wBAAA,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC;AAC9B,wBAAA,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;AAC1B,wBAAA,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC;AAChC,wBAAA,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC;AACjC,qBAAA;iBACJ,CAAC;aACL;;;AAKD,YAAA,IAAI,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;gBACjC,OAAO;AACH,oBAAA,GAAG,GAAG;AACN,oBAAA;AACI,wBAAA,OAAO,EAAE,CAAA,EAAG,UAAU,CAAA,CAAA,EAAI,QAAQ,CAAE,CAAA;AACpC,wBAAA,MAAM,EAAE,CAAA,EAAG,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAI,CAAA,EAAA,QAAQ,CAAE,CAAA;AACnE,wBAAA,IAAI,EAAE,CAAA,EAAG,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAI,CAAA,EAAA,QAAQ,CAAE,CAAA;AAClE,qBAAA;iBACJ,CAAC;aACL;AACD,YAAA,IAAI,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBAChC,OAAO;AACH,oBAAA,GAAG,GAAG;AACN,oBAAA;AACI,wBAAA,MAAM,EAAE,CAAA,EAAG,UAAU,CAAA,CAAA,EAAI,QAAQ,CAAE,CAAA;AACtC,qBAAA;iBACJ,CAAC;aACL;AACD,YAAA,IAAI,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;gBACjC,OAAO;AACH,oBAAA,GAAG,GAAG;AACN,oBAAA;AACI,wBAAA,OAAO,EAAE,CAAA,EAAG,UAAU,CAAA,CAAA,EAAI,QAAQ,CAAE,CAAA;AACvC,qBAAA;iBACJ,CAAC;aACL;;YAED,OAAO;AACH,gBAAA,GAAG,GAAG;AACN,gBAAA;AACI,oBAAA,WAAW,EAAE,CAAA,EAAG,UAAU,CAAA,CAAA,EAAI,QAAQ,CAAE,CAAA;AAC3C,iBAAA;aACJ,CAAC;SACL;QAAC,OAAO,CAAC,EAAE;AACR,YAAA,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACjB,YAAA,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,UAAU,CAAC,CAAC;AAC1D,YAAA,OAAO,GAAG,CAAC;SACd;KACJ,EAAE,EAAW,CAAC,CAAC;AACpB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@common-stack/rollup-vite-utils",
|
|
3
|
-
"version": "6.0.8-alpha.
|
|
3
|
+
"version": "6.0.8-alpha.48",
|
|
4
4
|
"description": "Client Module for react app",
|
|
5
5
|
"homepage": "https://github.com/cdmbase/fullstack-pro#readme",
|
|
6
6
|
"bugs": {
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"watch": "npm run build:lib:watch"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@common-stack/client-react": "6.0.8-alpha.
|
|
33
|
+
"@common-stack/client-react": "6.0.8-alpha.48",
|
|
34
34
|
"@common-stack/core": "6.0.8-alpha.31",
|
|
35
35
|
"ajv": "^8.17.1",
|
|
36
36
|
"dot-prop": "^9.0.0",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"publishConfig": {
|
|
57
57
|
"access": "public"
|
|
58
58
|
},
|
|
59
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "5ea9482cb218673cfd315d2d8040b586eeef38ba",
|
|
60
60
|
"typescript": {
|
|
61
61
|
"definition": "lib/index.d.ts"
|
|
62
62
|
}
|