@common-stack/rollup-vite-utils 8.5.1-alpha.4 → 8.6.1-alpha.10
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 +3 -2
- package/lib/vite-wrappers/generators/clientLoaderGenerator.cjs.map +1 -1
- package/lib/vite-wrappers/generators/clientLoaderGenerator.js +3 -2
- package/lib/vite-wrappers/generators/clientLoaderGenerator.js.map +1 -1
- package/lib/vite-wrappers/generators/serverQueryLoaderGenerator.cjs +1 -0
- package/lib/vite-wrappers/generators/serverQueryLoaderGenerator.cjs.map +1 -1
- package/lib/vite-wrappers/generators/serverQueryLoaderGenerator.js +1 -0
- package/lib/vite-wrappers/generators/serverQueryLoaderGenerator.js.map +1 -1
- package/lib/vite-wrappers/wrapperComponent.cjs +3 -3
- package/lib/vite-wrappers/wrapperComponent.js +3 -3
- package/package.json +4 -4
|
@@ -19,6 +19,7 @@ const generateClientLoader = (options) => {
|
|
|
19
19
|
const container = window.__CLIENT_SERVICE__?.container;
|
|
20
20
|
|
|
21
21
|
try {
|
|
22
|
+
const resourceParams = _dataContext?.resourceParams || {};
|
|
22
23
|
// Generate queries object with correct variables
|
|
23
24
|
const queries = ${Object.entries(queries).reduce((acc, [key, value], index) => {
|
|
24
25
|
const formattedValue = typeof value === 'string' && value.includes('queryParamsGenerator_')
|
|
@@ -85,6 +86,7 @@ const generateClientLoader = (options) => {
|
|
|
85
86
|
const container = window.__CLIENT_SERVICE__?.container;
|
|
86
87
|
|
|
87
88
|
try {
|
|
89
|
+
const resourceParams = _dataContext?.resourceParams || {};
|
|
88
90
|
// Generate queries object with correct variables
|
|
89
91
|
const queries = ${Object.entries(queries).reduce((acc, [key, value], index) => {
|
|
90
92
|
const formattedValue = typeof value === 'string' && value.includes('queryParamsGenerator_')
|
|
@@ -251,7 +253,6 @@ export async function clientLoader(params) {
|
|
|
251
253
|
? `
|
|
252
254
|
const apolloClient = window.__CLIENT_SERVICE__?.apolloClient;
|
|
253
255
|
const container = window.__CLIENT_SERVICE__?.container;
|
|
254
|
-
const logger = window.__CLIENT_SERVICE__?.logger;
|
|
255
256
|
let middlewareData = ${isSPAOnly && requireAuth ? 'middlewareOptions' : '{}'};
|
|
256
257
|
${isSPAOnly
|
|
257
258
|
? `
|
|
@@ -261,7 +262,7 @@ export async function clientLoader(params) {
|
|
|
261
262
|
`
|
|
262
263
|
: ''}
|
|
263
264
|
if (middlewareStack.length > 0) {
|
|
264
|
-
middlewareData = await clientLoaderWithMiddleware({...paramsWithResource, context:{ apolloClient, container
|
|
265
|
+
middlewareData = await clientLoaderWithMiddleware({...paramsWithResource, context:{ apolloClient, container }}, middlewareData, middlewareStack) || {};
|
|
265
266
|
}
|
|
266
267
|
// Exclude serverData from rest - it's internal to middleware and shouldn't be sent to component
|
|
267
268
|
let { permissions = null, configurations = null, resourceParams, serverData: _serverData, ...rest } = middlewareData;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientLoaderGenerator.cjs","sources":["../../../src/vite-wrappers/generators/clientLoaderGenerator.ts"],"sourcesContent":[null],"names":["camelCase","generateHasPermission"],"mappings":"4GAIA;;;;;;AAMG;AACU,MAAA,oBAAoB,GAAG,CAAC,OAAsD,KAAI;AAC3F,IAAA,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;AACtC,IAAA,MAAM,SAAS,GAAG,QAAQ,EAAE,UAAU,IAAI,KAAK,CAAC;AAEhD,IAAA,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;AACzC,QAAA,OAAO,EAAE,CAAC;KACb;;IAGD,IAAI,SAAS,EAAE;QACX,OAAO,CAAA
|
|
1
|
+
{"version":3,"file":"clientLoaderGenerator.cjs","sources":["../../../src/vite-wrappers/generators/clientLoaderGenerator.ts"],"sourcesContent":[null],"names":["camelCase","generateHasPermission"],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ const generateClientLoader = (options) => {
|
|
|
19
19
|
const container = window.__CLIENT_SERVICE__?.container;
|
|
20
20
|
|
|
21
21
|
try {
|
|
22
|
+
const resourceParams = _dataContext?.resourceParams || {};
|
|
22
23
|
// Generate queries object with correct variables
|
|
23
24
|
const queries = ${Object.entries(queries).reduce((acc, [key, value], index) => {
|
|
24
25
|
const formattedValue = typeof value === 'string' && value.includes('queryParamsGenerator_')
|
|
@@ -85,6 +86,7 @@ const generateClientLoader = (options) => {
|
|
|
85
86
|
const container = window.__CLIENT_SERVICE__?.container;
|
|
86
87
|
|
|
87
88
|
try {
|
|
89
|
+
const resourceParams = _dataContext?.resourceParams || {};
|
|
88
90
|
// Generate queries object with correct variables
|
|
89
91
|
const queries = ${Object.entries(queries).reduce((acc, [key, value], index) => {
|
|
90
92
|
const formattedValue = typeof value === 'string' && value.includes('queryParamsGenerator_')
|
|
@@ -251,7 +253,6 @@ export async function clientLoader(params) {
|
|
|
251
253
|
? `
|
|
252
254
|
const apolloClient = window.__CLIENT_SERVICE__?.apolloClient;
|
|
253
255
|
const container = window.__CLIENT_SERVICE__?.container;
|
|
254
|
-
const logger = window.__CLIENT_SERVICE__?.logger;
|
|
255
256
|
let middlewareData = ${isSPAOnly && requireAuth ? 'middlewareOptions' : '{}'};
|
|
256
257
|
${isSPAOnly
|
|
257
258
|
? `
|
|
@@ -261,7 +262,7 @@ export async function clientLoader(params) {
|
|
|
261
262
|
`
|
|
262
263
|
: ''}
|
|
263
264
|
if (middlewareStack.length > 0) {
|
|
264
|
-
middlewareData = await clientLoaderWithMiddleware({...paramsWithResource, context:{ apolloClient, container
|
|
265
|
+
middlewareData = await clientLoaderWithMiddleware({...paramsWithResource, context:{ apolloClient, container }}, middlewareData, middlewareStack) || {};
|
|
265
266
|
}
|
|
266
267
|
// Exclude serverData from rest - it's internal to middleware and shouldn't be sent to component
|
|
267
268
|
let { permissions = null, configurations = null, resourceParams, serverData: _serverData, ...rest } = middlewareData;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientLoaderGenerator.js","sources":["../../../src/vite-wrappers/generators/clientLoaderGenerator.ts"],"sourcesContent":[null],"names":[],"mappings":"iGAIA;;;;;;AAMG;AACU,MAAA,oBAAoB,GAAG,CAAC,OAAsD,KAAI;AAC3F,IAAA,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;AACtC,IAAA,MAAM,SAAS,GAAG,QAAQ,EAAE,UAAU,IAAI,KAAK,CAAC;AAEhD,IAAA,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;AACzC,QAAA,OAAO,EAAE,CAAC;KACb;;IAGD,IAAI,SAAS,EAAE;QACX,OAAO,CAAA
|
|
1
|
+
{"version":3,"file":"clientLoaderGenerator.js","sources":["../../../src/vite-wrappers/generators/clientLoaderGenerator.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ const generateServerLoader = ({ queries }) => {
|
|
|
14
14
|
return `
|
|
15
15
|
export const defaultServerLoader = async ({ context, params, _dataContext = {} }) => {
|
|
16
16
|
const { apolloClient: client } = context;
|
|
17
|
+
const resourceParams = _dataContext?.resourceParams || {};
|
|
17
18
|
const queries = ${Object.entries(queries).reduce((acc, [key, value], index) => {
|
|
18
19
|
const formattedValue = typeof value === 'string' && value.includes(constants.SEARCH_QUERY_PARAMS_GENERATOR)
|
|
19
20
|
? `queryGeneratorFunc({...params, _dataContext}).${value.split(constants.SEARCH_QUERY_PARAMS_GENERATOR)[1]}`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverQueryLoaderGenerator.cjs","sources":["../../../src/vite-wrappers/generators/serverQueryLoaderGenerator.ts"],"sourcesContent":[null],"names":["camelCase","SEARCH_QUERY_PARAMS_GENERATOR"],"mappings":"kGAIA;AACa,MAAA,gBAAgB,GAAG,CAAC,GAAW,KAAKA,kBAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE;AAEhH;;;;;;AAMG;MACU,oBAAoB,GAAG,CAAC,EAAE,OAAO,EAAoC,KAAI;AAClF,IAAA,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;AACzC,QAAA,OAAO,EAAE,CAAC;KACb;IACD,OAAO,CAAA
|
|
1
|
+
{"version":3,"file":"serverQueryLoaderGenerator.cjs","sources":["../../../src/vite-wrappers/generators/serverQueryLoaderGenerator.ts"],"sourcesContent":[null],"names":["camelCase","SEARCH_QUERY_PARAMS_GENERATOR"],"mappings":"kGAIA;AACa,MAAA,gBAAgB,GAAG,CAAC,GAAW,KAAKA,kBAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE;AAEhH;;;;;;AAMG;MACU,oBAAoB,GAAG,CAAC,EAAE,OAAO,EAAoC,KAAI;AAClF,IAAA,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;AACzC,QAAA,OAAO,EAAE,CAAC;KACb;IACD,OAAO,CAAA;;;;AAIW,oBAAA,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,GAChB,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAACC,uCAA6B,CAAC;cACpE,CAAiD,8CAAA,EAAA,KAAK,CAAC,KAAK,CAACA,uCAA6B,CAAC,CAAC,CAAC,CAAC,CAAE,CAAA;cAChG,KAAK,CAAC;AAChB,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;AACN,GAAA,EAAA,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;AACjB,SAAA,GAAG,CACA,CAAC,QAAQ,KAAK,CAAA;YACb,gBAAgB,CAAC,QAAQ,CAAC,CAAA;iBACrB,QAAQ,CAAA;8BACK,QAAQ,CAAA;;;MAGhC,CACE;SACA,IAAI,CAAC,EAAE,CAAC,CAAA;;;;cAIF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;;;;KAInD,CAAC;AACN"}
|
|
@@ -14,6 +14,7 @@ const generateServerLoader = ({ queries }) => {
|
|
|
14
14
|
return `
|
|
15
15
|
export const defaultServerLoader = async ({ context, params, _dataContext = {} }) => {
|
|
16
16
|
const { apolloClient: client } = context;
|
|
17
|
+
const resourceParams = _dataContext?.resourceParams || {};
|
|
17
18
|
const queries = ${Object.entries(queries).reduce((acc, [key, value], index) => {
|
|
18
19
|
const formattedValue = typeof value === 'string' && value.includes(SEARCH_QUERY_PARAMS_GENERATOR)
|
|
19
20
|
? `queryGeneratorFunc({...params, _dataContext}).${value.split(SEARCH_QUERY_PARAMS_GENERATOR)[1]}`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverQueryLoaderGenerator.js","sources":["../../../src/vite-wrappers/generators/serverQueryLoaderGenerator.ts"],"sourcesContent":[null],"names":[],"mappings":"2GAIA;AACa,MAAA,gBAAgB,GAAG,CAAC,GAAW,KAAK,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE;AAEhH;;;;;;AAMG;MACU,oBAAoB,GAAG,CAAC,EAAE,OAAO,EAAoC,KAAI;AAClF,IAAA,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;AACzC,QAAA,OAAO,EAAE,CAAC;KACb;IACD,OAAO,CAAA
|
|
1
|
+
{"version":3,"file":"serverQueryLoaderGenerator.js","sources":["../../../src/vite-wrappers/generators/serverQueryLoaderGenerator.ts"],"sourcesContent":[null],"names":[],"mappings":"2GAIA;AACa,MAAA,gBAAgB,GAAG,CAAC,GAAW,KAAK,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE;AAEhH;;;;;;AAMG;MACU,oBAAoB,GAAG,CAAC,EAAE,OAAO,EAAoC,KAAI;AAClF,IAAA,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;AACzC,QAAA,OAAO,EAAE,CAAC;KACb;IACD,OAAO,CAAA;;;;AAIW,oBAAA,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,GAChB,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,6BAA6B,CAAC;cACpE,CAAiD,8CAAA,EAAA,KAAK,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC,CAAE,CAAA;cAChG,KAAK,CAAC;AAChB,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;AACN,GAAA,EAAA,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;AACjB,SAAA,GAAG,CACA,CAAC,QAAQ,KAAK,CAAA;YACb,gBAAgB,CAAC,QAAQ,CAAC,CAAA;iBACrB,QAAQ,CAAA;8BACK,QAAQ,CAAA;;;MAGhC,CACE;SACA,IAAI,CAAC,EAAE,CAAC,CAAA;;;;cAIF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;;;;KAInD,CAAC;AACN"}
|
|
@@ -125,9 +125,9 @@ export const links: LinksFunction = () => {
|
|
|
125
125
|
else {
|
|
126
126
|
exports += `
|
|
127
127
|
export function shouldRevalidate(params) {
|
|
128
|
-
// Skip revalidation for
|
|
129
|
-
if (params.formMethod === "GET" && isEqual(params.currentParams, params.nextParams)) return false;
|
|
130
|
-
// Skip revalidation when pathname hasn't changed
|
|
128
|
+
// Skip revalidation for non-submission navigations (GET + POP/back-forward) with identical params
|
|
129
|
+
if ((!params.formMethod || params.formMethod === "GET") && isEqual(params.currentParams, params.nextParams)) return false;
|
|
130
|
+
// Skip revalidation when pathname hasn't changed
|
|
131
131
|
if (params.currentUrl.pathname === params.nextUrl.pathname) return false;
|
|
132
132
|
return params.defaultShouldRevalidate;
|
|
133
133
|
}
|
|
@@ -125,9 +125,9 @@ export const links: LinksFunction = () => {
|
|
|
125
125
|
else {
|
|
126
126
|
exports += `
|
|
127
127
|
export function shouldRevalidate(params) {
|
|
128
|
-
// Skip revalidation for
|
|
129
|
-
if (params.formMethod === "GET" && isEqual(params.currentParams, params.nextParams)) return false;
|
|
130
|
-
// Skip revalidation when pathname hasn't changed
|
|
128
|
+
// Skip revalidation for non-submission navigations (GET + POP/back-forward) with identical params
|
|
129
|
+
if ((!params.formMethod || params.formMethod === "GET") && isEqual(params.currentParams, params.nextParams)) return false;
|
|
130
|
+
// Skip revalidation when pathname hasn't changed
|
|
131
131
|
if (params.currentUrl.pathname === params.nextUrl.pathname) return false;
|
|
132
132
|
return params.defaultShouldRevalidate;
|
|
133
133
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@common-stack/rollup-vite-utils",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.6.1-alpha.10",
|
|
4
4
|
"description": "Client Module for react app",
|
|
5
5
|
"homepage": "https://github.com/cdmbase/fullstack-pro#readme",
|
|
6
6
|
"bugs": {
|
|
@@ -35,8 +35,8 @@
|
|
|
35
35
|
"watch": "npm run build:lib:watch"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@common-stack/client-react": "8.
|
|
39
|
-
"@common-stack/core": "8.
|
|
38
|
+
"@common-stack/client-react": "8.6.1-alpha.9",
|
|
39
|
+
"@common-stack/core": "8.6.1-alpha.9",
|
|
40
40
|
"@rollup/pluginutils": "^5.3.0",
|
|
41
41
|
"ajv": "^8.17.1",
|
|
42
42
|
"dot-prop": "^9.0.0",
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
"publishConfig": {
|
|
64
64
|
"access": "public"
|
|
65
65
|
},
|
|
66
|
-
"gitHead": "
|
|
66
|
+
"gitHead": "f189899d1c8bd06af30fa35561a6698658e28a8a",
|
|
67
67
|
"typescript": {
|
|
68
68
|
"definition": "lib/index.d.ts"
|
|
69
69
|
}
|