@common-stack/rollup-vite-utils 6.0.6-alpha.61 → 6.0.6-alpha.62
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/vite-wrappers/generators/clientLoaderGenerator.cjs +9 -4
- package/lib/vite-wrappers/generators/clientLoaderGenerator.cjs.map +1 -1
- package/lib/vite-wrappers/generators/clientLoaderGenerator.js +9 -4
- package/lib/vite-wrappers/generators/clientLoaderGenerator.js.map +1 -1
- package/package.json +2 -2
|
@@ -22,6 +22,7 @@ const generateClientLoader = ({ queries }) => {
|
|
|
22
22
|
return `${acc}${key}:${formattedValue}${index + 1 === Object.keys(queries).length ? '}' : ','}`;
|
|
23
23
|
}, '{')};
|
|
24
24
|
|
|
25
|
+
|
|
25
26
|
// Generate expected query keys
|
|
26
27
|
const queryKeys: string[] = [${Object.keys(queries)
|
|
27
28
|
.map((key) => lodashEs.camelCase(key.replace('Get', '')).replace('Document', 'Query'))
|
|
@@ -53,10 +54,14 @@ const generateClientLoader = ({ queries }) => {
|
|
|
53
54
|
|
|
54
55
|
if (!shouldCallServerLoader) return response;
|
|
55
56
|
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
57
|
+
let serverData = {};
|
|
58
|
+
if (_dataContext?.serverData) {
|
|
59
|
+
serverData = _dataContext.serverData;
|
|
60
|
+
} else {
|
|
61
|
+
// If cache is empty, call server loader
|
|
62
|
+
// find a way to avoid looping
|
|
63
|
+
serverData = await serverLoader();
|
|
64
|
+
}
|
|
60
65
|
if (serverData?.errors?.length) {
|
|
61
66
|
const store = container.get(ClientTypes.ReduxStore);
|
|
62
67
|
serverData?.errors?.forEach((error) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientLoaderGenerator.cjs","sources":["../../../src/vite-wrappers/generators/clientLoaderGenerator.ts"],"sourcesContent":[null],"names":["camelCase","generateHasPermission"],"mappings":"4GAIA;;;;;AAKG;MACU,oBAAoB,GAAG,CAAC,EAAE,OAAO,EAA6B,KAAI;AAC3E,IAAA,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;AACzC,QAAA,OAAO,EAAE,CAAC;KACb;IAED,OAAO,CAAA;;;;;;;AAOe,wBAAA,EAAA,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,KAAK,KAAI;AAC1E,QAAA,MAAM,cAAc,GAAG,KAAK,CAAC,QAAQ,CAAC,uBAAuB,CAAC;cACxD,CAAiD,8CAAA,EAAA,KAAK,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAAE,CAAA;cAC1F,KAAK,CAAC;AACZ,QAAA,OAAO,CAAG,EAAA,GAAG,CAAG,EAAA,GAAG,CAAI,CAAA,EAAA,cAAc,CAAG,EAAA,KAAK,GAAG,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,GAAG,GAAG,GAAG,CAAA,CAAE,CAAC;KACnG,EAAE,GAAG,CAAC,CAAA
|
|
1
|
+
{"version":3,"file":"clientLoaderGenerator.cjs","sources":["../../../src/vite-wrappers/generators/clientLoaderGenerator.ts"],"sourcesContent":[null],"names":["camelCase","generateHasPermission"],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ const generateClientLoader = ({ queries }) => {
|
|
|
22
22
|
return `${acc}${key}:${formattedValue}${index + 1 === Object.keys(queries).length ? '}' : ','}`;
|
|
23
23
|
}, '{')};
|
|
24
24
|
|
|
25
|
+
|
|
25
26
|
// Generate expected query keys
|
|
26
27
|
const queryKeys: string[] = [${Object.keys(queries)
|
|
27
28
|
.map((key) => camelCase(key.replace('Get', '')).replace('Document', 'Query'))
|
|
@@ -53,10 +54,14 @@ const generateClientLoader = ({ queries }) => {
|
|
|
53
54
|
|
|
54
55
|
if (!shouldCallServerLoader) return response;
|
|
55
56
|
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
57
|
+
let serverData = {};
|
|
58
|
+
if (_dataContext?.serverData) {
|
|
59
|
+
serverData = _dataContext.serverData;
|
|
60
|
+
} else {
|
|
61
|
+
// If cache is empty, call server loader
|
|
62
|
+
// find a way to avoid looping
|
|
63
|
+
serverData = await serverLoader();
|
|
64
|
+
}
|
|
60
65
|
if (serverData?.errors?.length) {
|
|
61
66
|
const store = container.get(ClientTypes.ReduxStore);
|
|
62
67
|
serverData?.errors?.forEach((error) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientLoaderGenerator.js","sources":["../../../src/vite-wrappers/generators/clientLoaderGenerator.ts"],"sourcesContent":[null],"names":[],"mappings":"iGAIA;;;;;AAKG;MACU,oBAAoB,GAAG,CAAC,EAAE,OAAO,EAA6B,KAAI;AAC3E,IAAA,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;AACzC,QAAA,OAAO,EAAE,CAAC;KACb;IAED,OAAO,CAAA;;;;;;;AAOe,wBAAA,EAAA,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,KAAK,KAAI;AAC1E,QAAA,MAAM,cAAc,GAAG,KAAK,CAAC,QAAQ,CAAC,uBAAuB,CAAC;cACxD,CAAiD,8CAAA,EAAA,KAAK,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAAE,CAAA;cAC1F,KAAK,CAAC;AACZ,QAAA,OAAO,CAAG,EAAA,GAAG,CAAG,EAAA,GAAG,CAAI,CAAA,EAAA,cAAc,CAAG,EAAA,KAAK,GAAG,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,GAAG,GAAG,GAAG,CAAA,CAAE,CAAC;KACnG,EAAE,GAAG,CAAC,CAAA
|
|
1
|
+
{"version":3,"file":"clientLoaderGenerator.js","sources":["../../../src/vite-wrappers/generators/clientLoaderGenerator.ts"],"sourcesContent":[null],"names":[],"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": "6.0.6-alpha.
|
|
3
|
+
"version": "6.0.6-alpha.62",
|
|
4
4
|
"description": "Client Module for react app",
|
|
5
5
|
"homepage": "https://github.com/cdmbase/fullstack-pro#readme",
|
|
6
6
|
"bugs": {
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"typescript": {
|
|
60
60
|
"definition": "lib/index.d.ts"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "c80ffb97bd59c9ca4f5e74e26760c7816c29217f"
|
|
63
63
|
}
|