@common-stack/rollup-vite-utils 8.0.2-alpha.0 → 8.1.1-alpha.0
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/LICENSE +34 -21
- package/lib/config-schema.cjs +104 -103
- package/lib/config-schema.cjs.map +1 -1
- package/lib/config-schema.js +104 -103
- package/lib/config-schema.js.map +1 -1
- package/lib/index.cjs +1 -1
- package/lib/index.js +1 -1
- package/lib/preStartup/configLoader/configLoader.cjs +135 -2
- package/lib/preStartup/configLoader/configLoader.cjs.map +1 -1
- package/lib/preStartup/configLoader/configLoader.js +135 -2
- package/lib/preStartup/configLoader/configLoader.js.map +1 -1
- package/lib/preStartup/configLoader/index.cjs +1 -1
- package/lib/preStartup/configLoader/index.cjs.map +1 -1
- package/lib/preStartup/configLoader/index.js +1 -1
- package/lib/preStartup/configLoader/index.js.map +1 -1
- package/lib/rollup/modifyLibFiles/extractGraphQLQueries.cjs +6 -2
- package/lib/rollup/modifyLibFiles/extractGraphQLQueries.cjs.map +1 -1
- package/lib/rollup/modifyLibFiles/extractGraphQLQueries.js +6 -2
- package/lib/rollup/modifyLibFiles/extractGraphQLQueries.js.map +1 -1
- package/lib/rollup/modifyLibFiles/handleComponentOrDialog.cjs +68 -3
- package/lib/rollup/modifyLibFiles/handleComponentOrDialog.cjs.map +1 -1
- package/lib/rollup/modifyLibFiles/handleComponentOrDialog.js +68 -3
- package/lib/rollup/modifyLibFiles/handleComponentOrDialog.js.map +1 -1
- package/lib/rollup/modifyLibFiles/handleLoaderReturn.cjs +2 -4
- package/lib/rollup/modifyLibFiles/handleLoaderReturn.cjs.map +1 -1
- package/lib/rollup/modifyLibFiles/handleLoaderReturn.js +2 -4
- package/lib/rollup/modifyLibFiles/handleLoaderReturn.js.map +1 -1
- package/lib/rollup/rollupPluginAddJsExtension.cjs +3 -13
- package/lib/rollup/rollupPluginAddJsExtension.cjs.map +1 -1
- package/lib/rollup/rollupPluginAddJsExtension.js +2 -12
- package/lib/rollup/rollupPluginAddJsExtension.js.map +1 -1
- package/lib/rollup/rollupPluginGenerateJson.cjs +27 -0
- package/lib/rollup/rollupPluginGenerateJson.cjs.map +1 -1
- package/lib/rollup/rollupPluginGenerateJson.d.ts +10 -0
- package/lib/rollup/rollupPluginGenerateJson.js +27 -0
- package/lib/rollup/rollupPluginGenerateJson.js.map +1 -1
- package/lib/rollup/rollupPluginGenerateJson.test.d.ts +1 -0
- package/lib/rollup/rollupPluginModifyLibFiles.cjs +102 -46
- package/lib/rollup/rollupPluginModifyLibFiles.cjs.map +1 -1
- package/lib/rollup/rollupPluginModifyLibFiles.js +102 -46
- package/lib/rollup/rollupPluginModifyLibFiles.js.map +1 -1
- package/lib/rollup/rollupPluginUpdateFromConfig.cjs +4 -7
- package/lib/rollup/rollupPluginUpdateFromConfig.cjs.map +1 -1
- package/lib/rollup/rollupPluginUpdateFromConfig.js +4 -7
- package/lib/rollup/rollupPluginUpdateFromConfig.js.map +1 -1
- package/lib/rollup/rollupPluginUpdateFromConfig.test.d.ts +1 -0
- package/lib/tools/codegen/generateCodegenConfig.cjs +30 -0
- package/lib/tools/codegen/generateCodegenConfig.cjs.map +1 -1
- package/lib/tools/codegen/generateCodegenConfig.js +30 -0
- package/lib/tools/codegen/generateCodegenConfig.js.map +1 -1
- package/lib/tools/codegen/index.cjs.map +1 -1
- package/lib/tools/codegen/index.js.map +1 -1
- package/lib/tools/codegen/performCopyOperations.cjs +103 -18
- package/lib/tools/codegen/performCopyOperations.cjs.map +1 -1
- package/lib/tools/codegen/performCopyOperations.js +103 -18
- package/lib/tools/codegen/performCopyOperations.js.map +1 -1
- package/lib/tools/codegen/readModules.cjs +80 -59
- package/lib/tools/codegen/readModules.cjs.map +1 -1
- package/lib/tools/codegen/readModules.d.ts +0 -18
- package/lib/tools/codegen/readModules.js +80 -59
- package/lib/tools/codegen/readModules.js.map +1 -1
- package/lib/tools/codegen/setupCommonPackage.cjs +14 -5
- package/lib/tools/codegen/setupCommonPackage.cjs.map +1 -1
- package/lib/tools/codegen/setupCommonPackage.d.ts +1 -1
- package/lib/tools/codegen/setupCommonPackage.js +14 -5
- package/lib/tools/codegen/setupCommonPackage.js.map +1 -1
- package/lib/tools/codegen/templates/common/package.json.template +11 -0
- package/lib/tools/codegen/templates/common/rollup.config.mjs.template +6 -1
- package/lib/tools/codegen/templates/common/scripts/fix-generated-types.js.template +58 -0
- package/lib/tools/codegen/templates/common/src/apollo-context.ts.bk.template +34 -0
- package/lib/tools/codegen/templates/common/src/apollo-context.ts.template +13 -20
- package/lib/tools/codegen/templates/common/src/client-context.ts.template +19 -0
- package/lib/tools/codegen/templates/common/src/core/disposable.ts.template +93 -0
- package/lib/tools/codegen/templates/common/src/core/event.test.ts +16 -0
- package/lib/tools/codegen/templates/common/src/core/event.ts.template +326 -0
- package/lib/tools/codegen/templates/common/src/core/index.ts.template +3 -0
- package/lib/tools/codegen/templates/common/src/core/types.ts.template +1 -0
- package/lib/tools/codegen/templates/common/src/generated/service-schemas.ts.template +1 -0
- package/lib/tools/codegen/templates/common/src/index.server.ts.template +7 -0
- package/lib/tools/codegen/templates/common/src/index.ts.template +1 -0
- package/lib/utils/index.d.ts +1 -0
- package/lib/utils/packageUtils.cjs +158 -0
- package/lib/utils/packageUtils.cjs.map +1 -0
- package/lib/utils/packageUtils.d.ts +74 -0
- package/lib/utils/packageUtils.js +158 -0
- package/lib/utils/packageUtils.js.map +1 -0
- package/lib/utils/packageUtils.test.d.ts +1 -0
- package/lib/utils/utils.cjs +1 -1
- package/lib/utils/utils.js +1 -1
- package/lib/vite-wrappers/__tests__/json-wrappers-null-routes.test.d.ts +1 -0
- package/lib/vite-wrappers/__tests__/wrapper-clientonly.test.d.ts +1 -0
- package/lib/vite-wrappers/generateRoutesFile.cjs +107 -0
- package/lib/vite-wrappers/generateRoutesFile.cjs.map +1 -0
- package/lib/vite-wrappers/generateRoutesFile.d.ts +13 -0
- package/lib/vite-wrappers/generateRoutesFile.js +107 -0
- package/lib/vite-wrappers/generateRoutesFile.js.map +1 -0
- package/lib/vite-wrappers/generators/clientLoaderGenerator.cjs +11 -3
- package/lib/vite-wrappers/generators/clientLoaderGenerator.cjs.map +1 -1
- package/lib/vite-wrappers/generators/clientLoaderGenerator.js +11 -3
- package/lib/vite-wrappers/generators/clientLoaderGenerator.js.map +1 -1
- package/lib/vite-wrappers/generators/loaderGenerator.cjs +7 -16
- package/lib/vite-wrappers/generators/loaderGenerator.cjs.map +1 -1
- package/lib/vite-wrappers/generators/loaderGenerator.d.ts +1 -0
- package/lib/vite-wrappers/generators/loaderGenerator.js +7 -16
- package/lib/vite-wrappers/generators/loaderGenerator.js.map +1 -1
- package/lib/vite-wrappers/generators/utils/resourceParams.cjs +48 -11
- package/lib/vite-wrappers/generators/utils/resourceParams.cjs.map +1 -1
- package/lib/vite-wrappers/generators/utils/resourceParams.d.ts +10 -4
- package/lib/vite-wrappers/generators/utils/resourceParams.js +48 -11
- package/lib/vite-wrappers/generators/utils/resourceParams.js.map +1 -1
- package/lib/vite-wrappers/icon-switch.cjs +7 -11
- package/lib/vite-wrappers/icon-switch.cjs.map +1 -1
- package/lib/vite-wrappers/icon-switch.d.ts +0 -1
- package/lib/vite-wrappers/icon-switch.js +6 -10
- package/lib/vite-wrappers/icon-switch.js.map +1 -1
- package/lib/vite-wrappers/json-wrappers.cjs +155 -22
- package/lib/vite-wrappers/json-wrappers.cjs.map +1 -1
- package/lib/vite-wrappers/json-wrappers.d.ts +9 -0
- package/lib/vite-wrappers/json-wrappers.js +155 -22
- package/lib/vite-wrappers/json-wrappers.js.map +1 -1
- package/lib/vite-wrappers/wrapperComponent.cjs +44 -22
- package/lib/vite-wrappers/wrapperComponent.cjs.map +1 -1
- package/lib/vite-wrappers/wrapperComponent.js +44 -22
- package/lib/vite-wrappers/wrapperComponent.js.map +1 -1
- package/package.json +5 -5
|
@@ -76,7 +76,7 @@ function getFunctionName(path) {
|
|
|
76
76
|
*/
|
|
77
77
|
function modifyReturn(filePath, loaderName) {
|
|
78
78
|
const ast = parseFileToAST(filePath, ['typescript', 'jsx']);
|
|
79
|
-
const returnInfo = {
|
|
79
|
+
const returnInfo = { keys: [], hasOptions: false };
|
|
80
80
|
let modified = false;
|
|
81
81
|
if (!ast)
|
|
82
82
|
return returnInfo;
|
|
@@ -139,7 +139,7 @@ function extractLoaderInfo(importedAst, fullPath) {
|
|
|
139
139
|
hasHandle: false,
|
|
140
140
|
hasHeaders: false,
|
|
141
141
|
},
|
|
142
|
-
returnInfo: {
|
|
142
|
+
returnInfo: { keys: [], hasOptions: false },
|
|
143
143
|
queries: {},
|
|
144
144
|
};
|
|
145
145
|
traverse(importedAst, {
|
|
@@ -251,7 +251,6 @@ function updateParentMetadata(parentObject, loaderInfo, returnInfo, queries) {
|
|
|
251
251
|
// Add return information if available
|
|
252
252
|
if (returnInfo.keys.length > 0) {
|
|
253
253
|
const returnInfoObject = t.objectExpression([
|
|
254
|
-
t.objectProperty(t.identifier('returnType'), t.stringLiteral(returnInfo.returnType)),
|
|
255
254
|
t.objectProperty(t.identifier('hasOptions'), t.booleanLiteral(returnInfo.hasOptions)),
|
|
256
255
|
t.objectProperty(t.identifier('keys'), t.arrayExpression(returnInfo.keys.map((key) => t.stringLiteral(key)))),
|
|
257
256
|
]);
|
|
@@ -291,6 +290,9 @@ function handleComponentOrDialog(astroPath, filePath, dist) {
|
|
|
291
290
|
// Check for hasServerCode property
|
|
292
291
|
const hasServerCodeProp = parentObject.node.properties.find((prop) => t.isObjectProperty(prop) && t.isIdentifier(prop.key, { name: 'hasServerCode' }));
|
|
293
292
|
const hasServerCode = hasServerCodeProp && t.isBooleanLiteral(hasServerCodeProp.value, { value: true });
|
|
293
|
+
// Check for generateSPAComponent property
|
|
294
|
+
const generateSPAComponentProp = parentObject.node.properties.find((prop) => t.isObjectProperty(prop) && t.isIdentifier(prop.key, { name: 'generateSPAComponent' }));
|
|
295
|
+
const generateSPAComponent = generateSPAComponentProp && t.isBooleanLiteral(generateSPAComponentProp.value, { value: true });
|
|
294
296
|
const { loaderInfo, returnInfo, queries } = extractLoaderInfoFromFile(path__default.resolve(path__default.dirname(filePath), importPath));
|
|
295
297
|
// Update parent metadata with client-side info
|
|
296
298
|
updateParentMetadata(parentObject.node, loaderInfo, returnInfo, queries);
|
|
@@ -301,9 +303,72 @@ function handleComponentOrDialog(astroPath, filePath, dist) {
|
|
|
301
303
|
// Update parent metadata with server-side info
|
|
302
304
|
updateParentMetadata(parentObject.node, serverLoaderInfo, serverReturnInfo, {});
|
|
303
305
|
}
|
|
306
|
+
// Generate .client.js file if generateSPAComponent is true
|
|
307
|
+
if (generateSPAComponent) {
|
|
308
|
+
generateClientOnlyFile(path__default.resolve(path__default.dirname(filePath), importPath));
|
|
309
|
+
// Mark that SPA component is available
|
|
310
|
+
parentObject.node.properties.push(t.objectProperty(t.identifier('hasSPAComponent'), t.booleanLiteral(true)));
|
|
311
|
+
}
|
|
304
312
|
return true;
|
|
305
313
|
}
|
|
306
314
|
}
|
|
307
315
|
}
|
|
308
316
|
return false;
|
|
317
|
+
}
|
|
318
|
+
/**
|
|
319
|
+
* Generates a .client.js file from the original component file,
|
|
320
|
+
* stripping out server-only exports (loader, action, headers, etc.)
|
|
321
|
+
*
|
|
322
|
+
* @param componentFilePath - The full path to the component file
|
|
323
|
+
*/
|
|
324
|
+
function generateClientOnlyFile(componentFilePath) {
|
|
325
|
+
const ast = parseFileToAST(componentFilePath);
|
|
326
|
+
if (!ast)
|
|
327
|
+
return;
|
|
328
|
+
const clientFilePath = componentFilePath.replace(/\.(js|ts|tsx|jsx)$/, '.client.$1');
|
|
329
|
+
// List of server-only exports to remove
|
|
330
|
+
const serverOnlyExports = ['loader', 'action', 'headers', 'shouldRevalidate'];
|
|
331
|
+
traverse(ast, {
|
|
332
|
+
ExportNamedDeclaration(exportPath) {
|
|
333
|
+
// Remove server-only named exports
|
|
334
|
+
if (exportPath.node.declaration) {
|
|
335
|
+
const declaration = exportPath.node.declaration;
|
|
336
|
+
// Check if it's a function or variable declaration
|
|
337
|
+
if (t.isFunctionDeclaration(declaration) && declaration.id) {
|
|
338
|
+
if (serverOnlyExports.includes(declaration.id.name)) {
|
|
339
|
+
exportPath.remove();
|
|
340
|
+
return;
|
|
341
|
+
}
|
|
342
|
+
}
|
|
343
|
+
if (t.isVariableDeclaration(declaration)) {
|
|
344
|
+
declaration.declarations = declaration.declarations.filter((declarator) => {
|
|
345
|
+
if (t.isIdentifier(declarator.id)) {
|
|
346
|
+
return !serverOnlyExports.includes(declarator.id.name);
|
|
347
|
+
}
|
|
348
|
+
return true;
|
|
349
|
+
});
|
|
350
|
+
// If no declarations left, remove the entire export
|
|
351
|
+
if (declaration.declarations.length === 0) {
|
|
352
|
+
exportPath.remove();
|
|
353
|
+
}
|
|
354
|
+
}
|
|
355
|
+
}
|
|
356
|
+
// Remove re-exports of server-only functions
|
|
357
|
+
if (exportPath.node.specifiers && exportPath.node.specifiers.length > 0) {
|
|
358
|
+
exportPath.node.specifiers = exportPath.node.specifiers.filter((specifier) => {
|
|
359
|
+
if (t.isExportSpecifier(specifier) && t.isIdentifier(specifier.exported)) {
|
|
360
|
+
return !serverOnlyExports.includes(specifier.exported.name);
|
|
361
|
+
}
|
|
362
|
+
return true;
|
|
363
|
+
});
|
|
364
|
+
// If no specifiers left, remove the entire export
|
|
365
|
+
if (exportPath.node.specifiers.length === 0) {
|
|
366
|
+
exportPath.remove();
|
|
367
|
+
}
|
|
368
|
+
}
|
|
369
|
+
},
|
|
370
|
+
});
|
|
371
|
+
// Write the client-only file
|
|
372
|
+
writeModifiedASTToFile(clientFilePath, ast);
|
|
373
|
+
console.log(`Generated SPA component: ${clientFilePath}`);
|
|
309
374
|
}export{extractLoaderInfoFromFile,handleComponentOrDialog};//# sourceMappingURL=handleComponentOrDialog.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleComponentOrDialog.js","sources":["../../../src/rollup/modifyLibFiles/handleComponentOrDialog.ts"],"sourcesContent":[null],"names":["fs","path"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"handleComponentOrDialog.js","sources":["../../../src/rollup/modifyLibFiles/handleComponentOrDialog.ts"],"sourcesContent":[null],"names":["fs","path"],"mappings":"mYAAA;AACA;AACA;AACA;AAaA;AACA,MAAM,QAAQ,GAAI,cAAsB,CAAC,OAAO,IAAI,cAAc,CAAC;AACnE,MAAM,QAAQ,GAAI,cAAsB,CAAC,OAAO,IAAI,cAAc,CAAC;AAEnE,MAAM,WAAW,GAAG;IAChB,OAAO,EAAE,SAAS;AAClB,IAAA,MAAM,EAAE,QAAQ;AAChB,IAAA,SAAS,EAAE,WAAW;AACtB,IAAA,YAAY,EAAE,cAAc;AAC5B,IAAA,eAAe,EAAE,iBAAiB;AAClC,IAAA,YAAY,EAAE,cAAc;AAC5B,IAAA,eAAe,EAAE,iBAAiB;AAClC,IAAA,SAAS,EAAE,WAAW;AACtB,IAAA,YAAY,EAAE,cAAc;AAC5B,IAAA,aAAa,EAAE,eAAe;AAC9B,IAAA,gBAAgB,EAAE,kBAAkB;AACpC,IAAA,MAAM,EAAE,QAAQ;AAChB,IAAA,SAAS,EAAE,WAAW;AACtB,IAAA,oBAAoB,EAAE,sBAAsB;AAC5C,IAAA,OAAO,EAAE,SAAS;AAClB,IAAA,UAAU,EAAE,YAAY;AACxB,IAAA,eAAe,EAAE,iBAAiB;AAClC,IAAA,kBAAkB,EAAE,oBAAoB;AACxC,IAAA,KAAK,EAAE,OAAO;AACd,IAAA,QAAQ,EAAE,UAAU;AACpB,IAAA,MAAM,EAAE,QAAQ;AAChB,IAAA,SAAS,EAAE,WAAW;AACtB,IAAA,IAAI,EAAE,MAAM;AACZ,IAAA,OAAO,EAAE,SAAS;AAClB,IAAA,gBAAgB,EAAE,kBAAkB;AACpC,IAAA,mBAAmB,EAAE,qBAAqB;CAC7C,CAAC;AAEF,SAAS,cAAc,CAAC,QAAgB,EAAE,UAAoC,CAAC,YAAY,EAAE,KAAK,CAAC,EAAA;AAC/F,IAAA,IAAI,CAACA,WAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;AAAE,QAAA,OAAO,IAAI,CAAC;IAC1C,MAAM,WAAW,GAAGA,WAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACtD,OAAO,KAAK,CAAC,WAAW,EAAE;AACtB,QAAA,UAAU,EAAE,QAAQ;QACpB,OAAO;AACO,KAAA,CAAC,CAAC;AACxB,CAAC;AAED;;;;;AAKG;AACH,SAAS,sBAAsB,CAAC,QAAgB,EAAE,GAAW,EAAA;IACzD,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACrCA,WAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;AAC5C,CAAC;AAED;;;;;AAKG;AACH,SAAS,eAAe,CACpB,IAAwF,EAAA;IAExF,IAAI,IAAI,CAAC,qBAAqB,EAAE,IAAI,IAAI,CAAC,oBAAoB,EAAE,EAAE;AAC7D,QAAA,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC;KAClD;IACD,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,oBAAoB,IAAI,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;AAC5F,QAAA,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC;KAC9B;AACD,IAAA,OAAO,IAAI,CAAC;AAChB,CAAC;AAED;;;;;;AAMG;AACH,SAAS,YAAY,CAAC,QAAgB,EAAE,UAAkB,EAAA;AACtD,IAAA,MAAM,GAAG,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAsB,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IACtE,IAAI,QAAQ,GAAG,KAAK,CAAC;AAErB,IAAA,IAAI,CAAC,GAAG;AAAE,QAAA,OAAO,UAAU,CAAC;IAE5B,QAAQ,CAAC,GAAG,EAAE;QACV,gEAAgE,EAAE,UAC9D,IAAwF,EAAA;AAExF,YAAA,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;YAC3C,IACI,YAAY,KAAK,UAAU;AAC3B,gBAAA,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,0BAA0B;AAC/C,iBAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,wBAAwB,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,KAAK,IAAI,CAAC,IAAI,CAAC,EAC1F;gBACE,IAAI,CAAC,QAAQ,CAAC;AACV,oBAAA,eAAe,CAAC,UAAuC,EAAA;wBACnD,QAAQ,GAAG,2BAA2B,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,QAAQ,CAAC;qBAC9E;AACJ,iBAAA,CAAC,CAAC;aACN;SACJ;AACJ,KAAA,CAAC,CAAC;IAEH,IAAI,QAAQ,EAAE;AACV,QAAA,sBAAsB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;KACzC;AACD,IAAA,OAAO,UAAU,CAAC;AACtB,CAAC;AAED;;;;;AAKG;AACG,SAAU,yBAAyB,CAAC,QAAgB,EAAA;AACtD,IAAA,MAAM,GAAG,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;AACrC,IAAA,IAAI,CAAC,GAAG;QACJ,OAAO;AACH,YAAA,UAAU,EAAE,EAA2B;AACvC,YAAA,UAAU,EAAE,EAAuB;AACnC,YAAA,OAAO,EAAE,EAAe;SAC3B,CAAC;AAEN,IAAA,OAAO,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;AAC5C,CAAC;AAED;;;;;;AAMG;AACH,SAAS,iBAAiB,CACtB,WAAmB,EACnB,QAAgB,EAAA;AAEhB,IAAA,IAAI,SAAS,GAIT;AACA,QAAA,UAAU,EAAE;AACR,YAAA,SAAS,EAAE,KAAK;AAChB,YAAA,SAAS,EAAE,KAAK;AAChB,YAAA,eAAe,EAAE,KAAK;AACtB,YAAA,eAAe,EAAE,KAAK;AACtB,YAAA,YAAY,EAAE,KAAK;AACnB,YAAA,gBAAgB,EAAE,KAAK;AACvB,YAAA,QAAQ,EAAE,KAAK;AACf,YAAA,OAAO,EAAE,KAAK;AACd,YAAA,oBAAoB,EAAE,KAAK;AAC3B,YAAA,kBAAkB,EAAE,KAAK;AACzB,YAAA,mBAAmB,EAAE,KAAK;AAC1B,YAAA,SAAS,EAAE,KAAK;AAChB,YAAA,UAAU,EAAE,KAAK;AACpB,SAAA;QACD,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE;AAC3C,QAAA,OAAO,EAAE,EAAE;KACd,CAAC;IAEF,QAAQ,CAAC,WAAW,EAAE;AAClB,QAAA,wBAAwB,CAAC,SAA+C,EAAA;;YAEpE,IAAI,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;AAC5C,gBAAA,SAAS,CAAC,UAAU,CAAC,YAAY,GAAG,IAAI,CAAC;aAC5C;SACJ;AACD,QAAA,sBAAsB,CAAC,SAA6C,EAAA;AAChE,YAAA,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE;gBACvB,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;AACrD,gBAAA,QAAQ,GAAGC,aAAI,CAAC,OAAO,CAACA,aAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,gBAAgB,CAAC,CAAC;aACrE;YACD,IAAI,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,KAAI;AAC5C,oBAAA,IAAI,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;wBACtE,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE;AAC9D,4BAAA,WAAW,EAAE,IAAI;4BACjB,QAAQ;AACR,4BAAA,SAAS,EAAE,SAAS,CAAC,KAAK,CAAC,IAAI;AAClC,yBAAA,CAAC,CAAC;qBACN;AACL,iBAAC,CAAC,CAAC;aACN;iBAAM;;AAEF,gBAAA,SAAS,CAAC,IAAI,CAAC,WAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,KAAI;AACrE,oBAAA,IAAI,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE;wBACvE,SAAS,GAAG,iBAAiB,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE;AAC1D,4BAAA,WAAW,EAAE,KAAK;AACrB,yBAAA,CAAC,CAAC;qBACN;AACL,iBAAC,CAAC,CAAC;aACN;SACJ;AACJ,KAAA,CAAC,CAAC;AAEH,IAAA,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,iBAAiB,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,EAAA;IACrD,QAAQ,UAAU;QACd,KAAK,WAAW,CAAC,MAAM;AACnB,YAAA,SAAS,CAAC,UAAU,CAAC,SAAS,GAAG,IAAI,CAAC;AACtC,YAAA,IAAI,OAAO,CAAC,WAAW,EAAE;AACrB,gBAAA,SAAS,CAAC,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;aAC5E;YACD,MAAM;QACV,KAAK,WAAW,CAAC,MAAM;AACnB,YAAA,SAAS,CAAC,UAAU,CAAC,SAAS,GAAG,IAAI,CAAC;YACtC,MAAM;QACV,KAAK,WAAW,CAAC,oBAAoB;AACjC,YAAA,SAAS,CAAC,UAAU,CAAC,oBAAoB,GAAG,IAAI,CAAC;YACjD,MAAM;QACV,KAAK,WAAW,CAAC,OAAO;AACpB,YAAA,SAAS,CAAC,UAAU,CAAC,YAAY,GAAG,IAAI,CAAC;AACzC,YAAA,IAAI,OAAO,CAAC,WAAW,EAAE;gBACrB,SAAS,CAAC,OAAO,GAAG,qBAAqB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;aAC/D;YACD,MAAM;QACV,KAAK,WAAW,CAAC,aAAa;AAC1B,YAAA,SAAS,CAAC,UAAU,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAC7C,MAAM;QACV,KAAK,WAAW,CAAC,YAAY;AACzB,YAAA,SAAS,CAAC,UAAU,CAAC,eAAe,GAAG,IAAI,CAAC;YAC5C,MAAM;QACV,KAAK,WAAW,CAAC,YAAY;AACzB,YAAA,SAAS,CAAC,UAAU,CAAC,eAAe,GAAG,IAAI,CAAC;YAC5C,MAAM;QACV,KAAK,WAAW,CAAC,OAAO;AACpB,YAAA,SAAS,CAAC,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC;YACvC,MAAM;QACV,KAAK,WAAW,CAAC,KAAK;AAClB,YAAA,SAAS,CAAC,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrC,MAAM;QACV,KAAK,WAAW,CAAC,IAAI;AACjB,YAAA,SAAS,CAAC,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;YACpC,MAAM;QACV,KAAK,WAAW,CAAC,gBAAgB;AAC7B,YAAA,SAAS,CAAC,UAAU,CAAC,mBAAmB,GAAG,IAAI,CAAC;YAChD,MAAM;QACV,KAAK,WAAW,CAAC,eAAe;AAC5B,YAAA,SAAS,CAAC,UAAU,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAC/C,MAAM;QACV,KAAK,WAAW,CAAC,MAAM;AACnB,YAAA,SAAS,CAAC,UAAU,CAAC,SAAS,GAAG,IAAI,CAAC;YACtC,MAAM;KAGb;IACD,OAAO;AACH,QAAA,UAAU,EAAE,EAAE,GAAG,SAAS,CAAC,UAAU,EAAE;AACvC,QAAA,UAAU,EAAE,EAAE,GAAG,SAAS,CAAC,UAAU,EAAE;AACvC,QAAA,OAAO,EAAE,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE;KACpC,CAAC;AACN,CAAC;AAED;;;;;;;AAOG;AACH,SAAS,oBAAoB,CACzB,YAAgC,EAChC,UAAiC,EACjC,UAA6B,EAC7B,OAAkB,EAAA;;IAGlB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,KAAI;AACpC,QAAA,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE;AACjB,YAAA,YAAY,CAAC,UAAU,CAAC,IAAI,CACxB,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CACtF,CAAC;SACL;AACL,KAAC,CAAC,CAAC;;IAGH,IAAI,UAAU,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;AAC5B,QAAA,MAAM,gBAAgB,GAAG,CAAC,CAAC,gBAAgB,CAAC;AACxC,YAAA,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AACrF,YAAA,CAAC,CAAC,cAAc,CACZ,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EACpB,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CACxE;AACJ,SAAA,CAAC,CAAC;AACH,QAAA,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC;KACtG;;AAGD,IAAA,MAAM,qBAAqB,GAAG,YAAY,CAAC,UAAU,CAAC,IAAI,CACtD,CAAC,IAAI,KACD,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC;AACxB,QAAA,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC;AAC3D,QAAA,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CACtD,CAAC;AAEF,IAAA,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,qBAAqB,EAAE;AAC3D,QAAA,YAAY,CAAC,UAAU,CAAC,IAAI,CACxB,CAAC,CAAC,cAAc,CACZ,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EACvB,CAAC,CAAC,gBAAgB,CACd,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,KACrC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CACtE,CACJ,CACJ,CACJ,CAAC;KACL;AACL,CAAC;AAED;;;;;;;AAOG;SACa,uBAAuB,CACnC,SAAqC,EACrC,QAAgB,EAChB,IAAY,EAAA;AAEZ,IAAA,MAAM,iBAAiB,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC;IAC/C,MAAM,QAAQ,GAAI,SAAS,CAAC,IAAI,CAAC,GAAW,CAAC,IAAI,CAAC;AAClD,IAAA,IACI,CAAC,CAAC,yBAAyB,CAAC,iBAAiB,CAAC;AAC9C,QAAA,CAAC,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAAC;QAC1C,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,EAC3C;QACE,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACtD,QAAA,IAAI,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE;AAC9B,YAAA,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC;YACnC,MAAM,oBAAoB,GAAG,kBAAkB,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;YAC5E,MAAM,YAAY,GAAG,CAAC,CAAC,cAAc,CACjC,CAAC,CAAC,UAAU,CAAC,CAAA,EAAG,QAAQ,CAAM,IAAA,CAAA,CAAC,EAC/B,CAAC,CAAC,aAAa,CAAC,oBAAoB,CAAC,CACxC,CAAC;AACF,YAAA,MAAM,YAAY,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,kBAAkB,EAAE,CAAC,CAAC;YACzE,IAAI,YAAY,IAAI,CAAC,CAAC,kBAAkB,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;gBACzD,SAAS,CAAC,MAAM,EAAE,CAAC;gBACnB,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;;AAGhD,gBAAA,MAAM,iBAAiB,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CACvD,CAAC,IAAI,KAAK,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAC5D,CAAC;AAElC,gBAAA,MAAM,aAAa,GAAG,iBAAiB,IAAI,CAAC,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;;AAGxG,gBAAA,MAAM,wBAAwB,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAC9D,CAAC,IAAI,KAAK,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC,CACnE,CAAC;AAElC,gBAAA,MAAM,oBAAoB,GACtB,wBAAwB,IAAI,CAAC,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBAEpG,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,yBAAyB,CACjEA,aAAI,CAAC,OAAO,CAACA,aAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CACnD,CAAC;;gBAGF,oBAAoB,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;;gBAGzE,IAAI,aAAa,EAAE;oBACf,MAAM,cAAc,GAAGA,aAAI,CAAC,OAAO,CAC/BA,aAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EACtB,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,CAC5C,CAAC;AACF,oBAAA,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAChE,yBAAyB,CAAC,cAAc,CAAC,CAAC;;oBAG9C,oBAAoB,CAAC,YAAY,CAAC,IAAI,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;iBACnF;;gBAGD,IAAI,oBAAoB,EAAE;AACtB,oBAAA,sBAAsB,CAACA,aAAI,CAAC,OAAO,CAACA,aAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;;oBAEzE,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAC7B,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAC5E,CAAC;iBACL;AAED,gBAAA,OAAO,IAAI,CAAC;aACf;SACJ;KACJ;AACD,IAAA,OAAO,KAAK,CAAC;AACjB,CAAC;AAED;;;;;AAKG;AACH,SAAS,sBAAsB,CAAC,iBAAyB,EAAA;AACrD,IAAA,MAAM,GAAG,GAAG,cAAc,CAAC,iBAAiB,CAAC,CAAC;AAC9C,IAAA,IAAI,CAAC,GAAG;QAAE,OAAO;IAEjB,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAC;;IAGrF,MAAM,iBAAiB,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,kBAAkB,CAAC,CAAC;IAE9E,QAAQ,CAAC,GAAG,EAAE;AACV,QAAA,sBAAsB,CAAC,UAA8C,EAAA;;AAEjE,YAAA,IAAI,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE;AAC7B,gBAAA,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC;;gBAGhD,IAAI,CAAC,CAAC,qBAAqB,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,EAAE,EAAE;oBACxD,IAAI,iBAAiB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;wBACjD,UAAU,CAAC,MAAM,EAAE,CAAC;wBACpB,OAAO;qBACV;iBACJ;AAED,gBAAA,IAAI,CAAC,CAAC,qBAAqB,CAAC,WAAW,CAAC,EAAE;AACtC,oBAAA,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,UAAU,KAAI;wBACtE,IAAI,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE;4BAC/B,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;yBAC1D;AACD,wBAAA,OAAO,IAAI,CAAC;AAChB,qBAAC,CAAC,CAAC;;oBAGH,IAAI,WAAW,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;wBACvC,UAAU,CAAC,MAAM,EAAE,CAAC;qBACvB;iBACJ;aACJ;;AAGD,YAAA,IAAI,UAAU,CAAC,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;AACrE,gBAAA,UAAU,CAAC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,KAAI;AACzE,oBAAA,IAAI,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;wBACtE,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;qBAC/D;AACD,oBAAA,OAAO,IAAI,CAAC;AAChB,iBAAC,CAAC,CAAC;;gBAGH,IAAI,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;oBACzC,UAAU,CAAC,MAAM,EAAE,CAAC;iBACvB;aACJ;SACJ;AACJ,KAAA,CAAC,CAAC;;AAGH,IAAA,sBAAsB,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;AAC5C,IAAA,OAAO,CAAC,GAAG,CAAC,4BAA4B,cAAc,CAAA,CAAE,CAAC,CAAC;AAC9D"}
|
|
@@ -42,6 +42,8 @@ function handleLoaderReturnStatement(returnPath, returnInfo) {
|
|
|
42
42
|
return false;
|
|
43
43
|
}
|
|
44
44
|
// Detect call expressions like defer, json, or other function calls
|
|
45
|
+
// Note: Both json() and defer() are deprecated in Remix v2 with Single Fetch
|
|
46
|
+
// We should return raw objects and promises directly instead
|
|
45
47
|
if (argument &&
|
|
46
48
|
((argument.type === 'CallExpression' &&
|
|
47
49
|
argument.callee.type === 'Identifier' &&
|
|
@@ -73,10 +75,6 @@ function handleLoaderReturnStatement(returnPath, returnInfo) {
|
|
|
73
75
|
}
|
|
74
76
|
// Modify the return statement to the required structure
|
|
75
77
|
returnPath.node.argument = t__namespace.objectExpression(objectProperties);
|
|
76
|
-
returnInfo.returnType =
|
|
77
|
-
argument.type === 'CallExpression' && t__namespace.isIdentifier(argument.callee)
|
|
78
|
-
? argument.callee.name
|
|
79
|
-
: 'json';
|
|
80
78
|
// Add a comment with returnInfo above the return statement
|
|
81
79
|
returnPath.addComment('leading', ` returnInfo: ${JSON.stringify(returnInfo)} `, true);
|
|
82
80
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleLoaderReturn.cjs","sources":["../../../src/rollup/modifyLibFiles/handleLoaderReturn.ts"],"sourcesContent":[null],"names":["t"],"mappings":"mYAKA;;;;;;AAMG;AACa,SAAA,2BAA2B,CACvC,UAAuC,EACvC,UAA6B,EAAA;AAE7B,IAAA,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC;;AAGrC,IAAA,MAAM,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC;IAC5C,IAAI,eAAe,EAAE;QACjB,MAAM,iBAAiB,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;QACnG,IAAI,iBAAiB,EAAE;;AAEnB,YAAA,IAAI;gBACA,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC9F,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;gBACtC,OAAO,KAAK,CAAC;aAChB;YAAC,OAAO,CAAC,EAAE;AACR,gBAAA,OAAO,CAAC,IAAI,CAAC,qCAAqC,EAAE,CAAC,CAAC,CAAC;aAC1D;SACJ;KACJ;;AAGD,IAAA,IACI,QAAQ;QACR,QAAQ,CAAC,IAAI,KAAK,kBAAkB;AACpC,QAAA,QAAQ,CAAC,UAAU,CAAC,IAAI,CACpB,CAAC,IAAI,KACDA,YAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC;AACxB,YAAAA,YAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;YAC1CA,YAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CACtC,EACH;;AAEE,QAAA,MAAM,YAAY,GAAG,QAAQ,CAAC,UAAU,CAAC,IAAI,CACzC,CAAC,IAAI,KAAKA,YAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAIA,YAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAC/D,CAAC;QAEtB,IAAI,YAAY,IAAIA,YAAC,CAAC,iBAAiB,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;;AAExD,YAAA,UAAkB,CAAC,UAAU,GAAG,MAAM,CAAC;AACxC,YAAA,UAAU,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,QAAQ;AACxC,iBAAA,MAAM,CAAC,CAAC,OAAO,KAA8BA,YAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;iBACrE,GAAG,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;SACvC;;AAGD,QAAA,OAAO,KAAK,CAAC;KAChB
|
|
1
|
+
{"version":3,"file":"handleLoaderReturn.cjs","sources":["../../../src/rollup/modifyLibFiles/handleLoaderReturn.ts"],"sourcesContent":[null],"names":["t"],"mappings":"mYAKA;;;;;;AAMG;AACa,SAAA,2BAA2B,CACvC,UAAuC,EACvC,UAA6B,EAAA;AAE7B,IAAA,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC;;AAGrC,IAAA,MAAM,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC;IAC5C,IAAI,eAAe,EAAE;QACjB,MAAM,iBAAiB,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;QACnG,IAAI,iBAAiB,EAAE;;AAEnB,YAAA,IAAI;gBACA,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC9F,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;gBACtC,OAAO,KAAK,CAAC;aAChB;YAAC,OAAO,CAAC,EAAE;AACR,gBAAA,OAAO,CAAC,IAAI,CAAC,qCAAqC,EAAE,CAAC,CAAC,CAAC;aAC1D;SACJ;KACJ;;AAGD,IAAA,IACI,QAAQ;QACR,QAAQ,CAAC,IAAI,KAAK,kBAAkB;AACpC,QAAA,QAAQ,CAAC,UAAU,CAAC,IAAI,CACpB,CAAC,IAAI,KACDA,YAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC;AACxB,YAAAA,YAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;YAC1CA,YAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CACtC,EACH;;AAEE,QAAA,MAAM,YAAY,GAAG,QAAQ,CAAC,UAAU,CAAC,IAAI,CACzC,CAAC,IAAI,KAAKA,YAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAIA,YAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAC/D,CAAC;QAEtB,IAAI,YAAY,IAAIA,YAAC,CAAC,iBAAiB,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;;AAExD,YAAA,UAAkB,CAAC,UAAU,GAAG,MAAM,CAAC;AACxC,YAAA,UAAU,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,QAAQ;AACxC,iBAAA,MAAM,CAAC,CAAC,OAAO,KAA8BA,YAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;iBACrE,GAAG,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;SACvC;;AAGD,QAAA,OAAO,KAAK,CAAC;KAChB;;;;AAKD,IAAA,IACI,QAAQ;AACR,SAAC,CAAC,QAAQ,CAAC,IAAI,KAAK,gBAAgB;AAChC,YAAA,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY;AACrC,aAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC;AACrE,YAAA,QAAQ,CAAC,IAAI,KAAK,kBAAkB,CAAC,EAC3C;AACE,QAAA,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,KAAK,gBAAgB,GAAG,QAAQ,CAAC,SAAS,GAAG,CAAC,QAAQ,CAAC,CAAC;QAElF,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,kBAAkB,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YACzF,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC,CAAuB,CAAC;YACrD,MAAM,WAAW,GAAG,UAAU;AACzB,iBAAA,GAAG,CAAC,CAAC,IAAI,KAAI;AACV,gBAAA,MAAM,EAAE,KAAK,EAAE,GAAG,IAAwB,CAAC;AAC3C,gBAAA,IAAIA,YAAC,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;AACvB,oBAAA,OAAO,KAAK,CAAC;iBAChB;AACD,gBAAA,OAAO,IAAI,CAAC;AAChB,aAAC,CAAC;iBACD,MAAM,CAAC,OAAO,CAAC,CAAC;AAErB,YAAA,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,KAAI;AACxB,gBAAA,MAAM,EAAE,GAAG,EAAE,GAAG,IAAwB,CAAC;AACzC,gBAAA,IAAIA,YAAC,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE;oBACrB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;iBAClC;AACL,aAAC,CAAC,CAAC;YAEH,MAAM,gBAAgB,GAAG,CAACA,YAAC,CAAC,cAAc,CAACA,YAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAAEA,YAAC,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;;AAGlG,YAAA,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,kBAAkB,EAAE;AACxD,gBAAA,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC;gBAC7B,gBAAgB,CAAC,IAAI,CAACA,YAAC,CAAC,cAAc,CAACA,YAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAC7E;;YAGD,UAAU,CAAC,IAAI,CAAC,QAAQ,GAAGA,YAAC,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;;AAGhE,YAAA,UAAU,CAAC,UAAU,CAAC,SAAS,EAAE,gBAAgB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA,CAAA,CAAG,EAAE,IAAI,CAAC,CAAC;AAEtF,YAAA,OAAO,IAAI,CAAC;SACf;KACJ;AAED,IAAA,OAAO,KAAK,CAAC;AACjB"}
|
|
@@ -42,6 +42,8 @@ function handleLoaderReturnStatement(returnPath, returnInfo) {
|
|
|
42
42
|
return false;
|
|
43
43
|
}
|
|
44
44
|
// Detect call expressions like defer, json, or other function calls
|
|
45
|
+
// Note: Both json() and defer() are deprecated in Remix v2 with Single Fetch
|
|
46
|
+
// We should return raw objects and promises directly instead
|
|
45
47
|
if (argument &&
|
|
46
48
|
((argument.type === 'CallExpression' &&
|
|
47
49
|
argument.callee.type === 'Identifier' &&
|
|
@@ -73,10 +75,6 @@ function handleLoaderReturnStatement(returnPath, returnInfo) {
|
|
|
73
75
|
}
|
|
74
76
|
// Modify the return statement to the required structure
|
|
75
77
|
returnPath.node.argument = t.objectExpression(objectProperties);
|
|
76
|
-
returnInfo.returnType =
|
|
77
|
-
argument.type === 'CallExpression' && t.isIdentifier(argument.callee)
|
|
78
|
-
? argument.callee.name
|
|
79
|
-
: 'json';
|
|
80
78
|
// Add a comment with returnInfo above the return statement
|
|
81
79
|
returnPath.addComment('leading', ` returnInfo: ${JSON.stringify(returnInfo)} `, true);
|
|
82
80
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleLoaderReturn.js","sources":["../../../src/rollup/modifyLibFiles/handleLoaderReturn.ts"],"sourcesContent":[null],"names":[],"mappings":"+BAKA;;;;;;AAMG;AACa,SAAA,2BAA2B,CACvC,UAAuC,EACvC,UAA6B,EAAA;AAE7B,IAAA,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC;;AAGrC,IAAA,MAAM,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC;IAC5C,IAAI,eAAe,EAAE;QACjB,MAAM,iBAAiB,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;QACnG,IAAI,iBAAiB,EAAE;;AAEnB,YAAA,IAAI;gBACA,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC9F,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;gBACtC,OAAO,KAAK,CAAC;aAChB;YAAC,OAAO,CAAC,EAAE;AACR,gBAAA,OAAO,CAAC,IAAI,CAAC,qCAAqC,EAAE,CAAC,CAAC,CAAC;aAC1D;SACJ;KACJ;;AAGD,IAAA,IACI,QAAQ;QACR,QAAQ,CAAC,IAAI,KAAK,kBAAkB;AACpC,QAAA,QAAQ,CAAC,UAAU,CAAC,IAAI,CACpB,CAAC,IAAI,KACD,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC;AACxB,YAAA,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;YAC1C,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CACtC,EACH;;AAEE,QAAA,MAAM,YAAY,GAAG,QAAQ,CAAC,UAAU,CAAC,IAAI,CACzC,CAAC,IAAI,KAAK,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAC/D,CAAC;QAEtB,IAAI,YAAY,IAAI,CAAC,CAAC,iBAAiB,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;;AAExD,YAAA,UAAkB,CAAC,UAAU,GAAG,MAAM,CAAC;AACxC,YAAA,UAAU,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,QAAQ;AACxC,iBAAA,MAAM,CAAC,CAAC,OAAO,KAA8B,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;iBACrE,GAAG,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;SACvC;;AAGD,QAAA,OAAO,KAAK,CAAC;KAChB
|
|
1
|
+
{"version":3,"file":"handleLoaderReturn.js","sources":["../../../src/rollup/modifyLibFiles/handleLoaderReturn.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
'use strict';Object.defineProperty(exports,'__esModule',{value:true});var parser=require('@babel/parser'),generateSource=require('@babel/generator'),traverseSource=require('@babel/traverse');// to support esm default
|
|
1
|
+
'use strict';Object.defineProperty(exports,'__esModule',{value:true});var parser=require('@babel/parser'),generateSource=require('@babel/generator'),traverseSource=require('@babel/traverse'),packageUtils=require('../utils/packageUtils.cjs');// to support esm default
|
|
2
2
|
const traverse = traverseSource.default ?? traverseSource;
|
|
3
3
|
const generate = generateSource.default ?? generateSource;
|
|
4
4
|
// Helper to convert a wildcard pattern (e.g. "@apollo/server*")
|
|
@@ -24,7 +24,7 @@ const addJsExtensionToImportsPlugin = (options) => {
|
|
|
24
24
|
return null;
|
|
25
25
|
const ast = parser.parse(code, {
|
|
26
26
|
sourceType: 'module',
|
|
27
|
-
plugins: ['typescript', 'jsx'],
|
|
27
|
+
plugins: ['typescript', 'jsx', 'decorators-legacy'],
|
|
28
28
|
});
|
|
29
29
|
traverse(ast, {
|
|
30
30
|
ImportDeclaration(path) {
|
|
@@ -38,17 +38,7 @@ const addJsExtensionToImportsPlugin = (options) => {
|
|
|
38
38
|
// Skip relative imports
|
|
39
39
|
if (source.startsWith('./') || source.startsWith('../'))
|
|
40
40
|
return;
|
|
41
|
-
const
|
|
42
|
-
if (importPath.startsWith('@')) {
|
|
43
|
-
const match = importPath.match(/^(@[^/]+\/[^/]+)/);
|
|
44
|
-
return match ? match[1] : null;
|
|
45
|
-
}
|
|
46
|
-
else {
|
|
47
|
-
const match = importPath.match(/^([^/]+)/);
|
|
48
|
-
return match ? match[1] : null;
|
|
49
|
-
}
|
|
50
|
-
};
|
|
51
|
-
const packageName = getPackageName(source);
|
|
41
|
+
const packageName = packageUtils.getPackageName(source);
|
|
52
42
|
const slashCount = (source.match(/\//g) || []).length;
|
|
53
43
|
if (options.packages === '*') {
|
|
54
44
|
const isInExceptionList = packageName && mergedNeedToAddIndexJs.includes(packageName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rollupPluginAddJsExtension.cjs","sources":["../../src/rollup/rollupPluginAddJsExtension.ts"],"sourcesContent":[null],"names":["parse"],"mappings":"
|
|
1
|
+
{"version":3,"file":"rollupPluginAddJsExtension.cjs","sources":["../../src/rollup/rollupPluginAddJsExtension.ts"],"sourcesContent":[null],"names":["parse","getPackageName"],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {parse}from'@babel/parser';import generateSource from'@babel/generator';import traverseSource from'@babel/traverse';// to support esm default
|
|
1
|
+
import {parse}from'@babel/parser';import generateSource from'@babel/generator';import traverseSource from'@babel/traverse';import {getPackageName}from'../utils/packageUtils.js';// to support esm default
|
|
2
2
|
const traverse = traverseSource.default ?? traverseSource;
|
|
3
3
|
const generate = generateSource.default ?? generateSource;
|
|
4
4
|
// Helper to convert a wildcard pattern (e.g. "@apollo/server*")
|
|
@@ -24,7 +24,7 @@ const addJsExtensionToImportsPlugin = (options) => {
|
|
|
24
24
|
return null;
|
|
25
25
|
const ast = parse(code, {
|
|
26
26
|
sourceType: 'module',
|
|
27
|
-
plugins: ['typescript', 'jsx'],
|
|
27
|
+
plugins: ['typescript', 'jsx', 'decorators-legacy'],
|
|
28
28
|
});
|
|
29
29
|
traverse(ast, {
|
|
30
30
|
ImportDeclaration(path) {
|
|
@@ -38,16 +38,6 @@ const addJsExtensionToImportsPlugin = (options) => {
|
|
|
38
38
|
// Skip relative imports
|
|
39
39
|
if (source.startsWith('./') || source.startsWith('../'))
|
|
40
40
|
return;
|
|
41
|
-
const getPackageName = (importPath) => {
|
|
42
|
-
if (importPath.startsWith('@')) {
|
|
43
|
-
const match = importPath.match(/^(@[^/]+\/[^/]+)/);
|
|
44
|
-
return match ? match[1] : null;
|
|
45
|
-
}
|
|
46
|
-
else {
|
|
47
|
-
const match = importPath.match(/^([^/]+)/);
|
|
48
|
-
return match ? match[1] : null;
|
|
49
|
-
}
|
|
50
|
-
};
|
|
51
41
|
const packageName = getPackageName(source);
|
|
52
42
|
const slashCount = (source.match(/\//g) || []).length;
|
|
53
43
|
if (options.packages === '*') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rollupPluginAddJsExtension.js","sources":["../../src/rollup/rollupPluginAddJsExtension.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rollupPluginAddJsExtension.js","sources":["../../src/rollup/rollupPluginAddJsExtension.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,33 @@
|
|
|
25
25
|
this.warn(`Error importing ${file}: ${error}`);
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
|
+
// Apply route overrides if specified in settings
|
|
29
|
+
if (options.settings?.overrideRoutes && allFilteredRoutes.length > 0) {
|
|
30
|
+
const routeOverrides = Array.isArray(options.settings.overrideRoutes)
|
|
31
|
+
? options.settings.overrideRoutes
|
|
32
|
+
: [options.settings.overrideRoutes];
|
|
33
|
+
// Create a new array to store updated routes
|
|
34
|
+
const updatedRoutes = [...allFilteredRoutes];
|
|
35
|
+
// Process each route override
|
|
36
|
+
for (const override of routeOverrides) {
|
|
37
|
+
const { oldRoute, newRoute } = override;
|
|
38
|
+
// Find all route entries with the oldRoute path
|
|
39
|
+
updatedRoutes.forEach((routeEntry, index) => {
|
|
40
|
+
const routeKey = Object.keys(routeEntry)[0];
|
|
41
|
+
const routeConfig = routeEntry[routeKey];
|
|
42
|
+
// If this entry has the old route path, update it
|
|
43
|
+
if (routeKey === oldRoute) {
|
|
44
|
+
// Create a new route entry with the updated path
|
|
45
|
+
const updatedConfig = { ...routeConfig, path: newRoute };
|
|
46
|
+
updatedRoutes[index] = { [newRoute]: updatedConfig };
|
|
47
|
+
console.log(`Overriding route: ${oldRoute} -> ${newRoute}`);
|
|
48
|
+
}
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
// Replace the original array with the updated one
|
|
52
|
+
allFilteredRoutes.length = 0;
|
|
53
|
+
allFilteredRoutes.push(...updatedRoutes);
|
|
54
|
+
}
|
|
28
55
|
// Ensure the dist directory exists
|
|
29
56
|
if (!fs.existsSync(dist)) {
|
|
30
57
|
fs.mkdirSync(dist, { recursive: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rollupPluginGenerateJson.cjs","sources":["../../src/rollup/rollupPluginGenerateJson.ts"],"sourcesContent":[null],"names":["glob"],"mappings":"
|
|
1
|
+
{"version":3,"file":"rollupPluginGenerateJson.cjs","sources":["../../src/rollup/rollupPluginGenerateJson.ts"],"sourcesContent":[null],"names":["glob"],"mappings":"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"}
|
|
@@ -2,6 +2,16 @@ interface GenerateJsonOptions {
|
|
|
2
2
|
pattern?: string;
|
|
3
3
|
dist?: string;
|
|
4
4
|
outputFile?: string;
|
|
5
|
+
settings?: {
|
|
6
|
+
overrideRoutes?: {
|
|
7
|
+
oldRoute: string;
|
|
8
|
+
newRoute: string;
|
|
9
|
+
} | Array<{
|
|
10
|
+
oldRoute: string;
|
|
11
|
+
newRoute: string;
|
|
12
|
+
}>;
|
|
13
|
+
[key: string]: unknown;
|
|
14
|
+
};
|
|
5
15
|
}
|
|
6
16
|
export default function generateJsonFromSpecificFiles(options?: GenerateJsonOptions): {
|
|
7
17
|
name: string;
|
|
@@ -25,6 +25,33 @@ import {glob}from'glob';import fs__default from'fs';import path__default from'pa
|
|
|
25
25
|
this.warn(`Error importing ${file}: ${error}`);
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
|
+
// Apply route overrides if specified in settings
|
|
29
|
+
if (options.settings?.overrideRoutes && allFilteredRoutes.length > 0) {
|
|
30
|
+
const routeOverrides = Array.isArray(options.settings.overrideRoutes)
|
|
31
|
+
? options.settings.overrideRoutes
|
|
32
|
+
: [options.settings.overrideRoutes];
|
|
33
|
+
// Create a new array to store updated routes
|
|
34
|
+
const updatedRoutes = [...allFilteredRoutes];
|
|
35
|
+
// Process each route override
|
|
36
|
+
for (const override of routeOverrides) {
|
|
37
|
+
const { oldRoute, newRoute } = override;
|
|
38
|
+
// Find all route entries with the oldRoute path
|
|
39
|
+
updatedRoutes.forEach((routeEntry, index) => {
|
|
40
|
+
const routeKey = Object.keys(routeEntry)[0];
|
|
41
|
+
const routeConfig = routeEntry[routeKey];
|
|
42
|
+
// If this entry has the old route path, update it
|
|
43
|
+
if (routeKey === oldRoute) {
|
|
44
|
+
// Create a new route entry with the updated path
|
|
45
|
+
const updatedConfig = { ...routeConfig, path: newRoute };
|
|
46
|
+
updatedRoutes[index] = { [newRoute]: updatedConfig };
|
|
47
|
+
console.log(`Overriding route: ${oldRoute} -> ${newRoute}`);
|
|
48
|
+
}
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
// Replace the original array with the updated one
|
|
52
|
+
allFilteredRoutes.length = 0;
|
|
53
|
+
allFilteredRoutes.push(...updatedRoutes);
|
|
54
|
+
}
|
|
28
55
|
// Ensure the dist directory exists
|
|
29
56
|
if (!fs__default.existsSync(dist)) {
|
|
30
57
|
fs__default.mkdirSync(dist, { recursive: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rollupPluginGenerateJson.js","sources":["../../src/rollup/rollupPluginGenerateJson.ts"],"sourcesContent":[null],"names":["path","fs"],"mappings":"
|
|
1
|
+
{"version":3,"file":"rollupPluginGenerateJson.js","sources":["../../src/rollup/rollupPluginGenerateJson.ts"],"sourcesContent":[null],"names":["path","fs"],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -10,55 +10,111 @@ function writeModifiedASTToFile(filePath, ast, originalCode) {
|
|
|
10
10
|
function modifyLibFilesPlugin(options = {}) {
|
|
11
11
|
const filter = pluginutils.createFilter(options.include, options.exclude);
|
|
12
12
|
const dist = options.outputDir || './lib';
|
|
13
|
-
const pattern = '**/**/compute.js';
|
|
14
13
|
return {
|
|
15
14
|
name: 'modify-lib-files',
|
|
16
15
|
async writeBundle(outputOptions) {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
if (!filter(filePath))
|
|
20
|
-
return;
|
|
21
|
-
const code = fs.readFileSync(filePath, 'utf8');
|
|
22
|
-
const ast = parser.parse(code, {
|
|
23
|
-
sourceType: 'module',
|
|
24
|
-
plugins: ['js', 'dynamicImport'],
|
|
25
|
-
});
|
|
26
|
-
let modified = false;
|
|
27
|
-
traverse(ast, {
|
|
28
|
-
enter(astroPath) {
|
|
29
|
-
if (t__namespace.isObjectProperty(astroPath.node) && t__namespace.isIdentifier(astroPath.node.key)) {
|
|
30
|
-
switch (astroPath.node.key.name) {
|
|
31
|
-
case 'component':
|
|
32
|
-
case 'dialog':
|
|
33
|
-
modified =
|
|
34
|
-
handleComponentOrDialog.handleComponentOrDialog(astroPath, filePath, dist) || modified;
|
|
35
|
-
break;
|
|
36
|
-
case 'importPaths':
|
|
37
|
-
modified =
|
|
38
|
-
handleImportPaths.handleImportPaths(astroPath, filePath, dist) ||
|
|
39
|
-
modified;
|
|
40
|
-
break;
|
|
41
|
-
case 'wrappers':
|
|
42
|
-
if (t__namespace.isArrayExpression(astroPath.node.value)) {
|
|
43
|
-
modified =
|
|
44
|
-
handleWrappers.handleWrappers(astroPath, filePath, dist) ||
|
|
45
|
-
modified;
|
|
46
|
-
}
|
|
47
|
-
break;
|
|
48
|
-
case 'icon':
|
|
49
|
-
if (t__namespace.isObjectExpression(astroPath.node.value)) {
|
|
50
|
-
modified = handleIconSVGFiles.handleIconSVGFiles(astroPath, filePath, dist) || modified;
|
|
51
|
-
}
|
|
52
|
-
break;
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
},
|
|
56
|
-
});
|
|
57
|
-
if (modified) {
|
|
58
|
-
writeModifiedASTToFile(filePath, ast, code);
|
|
59
|
-
}
|
|
60
|
-
return null;
|
|
61
|
-
});
|
|
16
|
+
await modifyComputeJs(dist, filter);
|
|
17
|
+
// await modifyModuleJs(dist, filter);
|
|
62
18
|
},
|
|
63
19
|
};
|
|
20
|
+
}
|
|
21
|
+
/*
|
|
22
|
+
* This function modifies the module.js files to add the renderFilePath property from renderImporter.
|
|
23
|
+
* But we are not using this function in the plugin for now.
|
|
24
|
+
*/
|
|
25
|
+
// async function modifyModuleJs(dist: string, filter: (id: string) => boolean) {
|
|
26
|
+
// const pattern = '**/**/module.js';
|
|
27
|
+
// const filesToModify: string[] = await glob(path.join(dist, pattern), { absolute: true });
|
|
28
|
+
// filesToModify.forEach((filePath) => {
|
|
29
|
+
// if (!filter(filePath)) return;
|
|
30
|
+
// const code = fs.readFileSync(filePath, 'utf8');
|
|
31
|
+
// const ast = parse(code, {
|
|
32
|
+
// sourceType: 'module',
|
|
33
|
+
// plugins: ['js', 'dynamicImport'],
|
|
34
|
+
// } as ParserOptions);
|
|
35
|
+
// let modified = false;
|
|
36
|
+
// traverse(ast, {
|
|
37
|
+
// enter(astroPath: NodePath<t.Node>) {
|
|
38
|
+
// if (t.isObjectProperty(astroPath.node) && t.isIdentifier(astroPath.node.key)) {
|
|
39
|
+
// if (astroPath.node.key.name === 'componentFillPlugins' && t.isArrayExpression(astroPath.node.value)) {
|
|
40
|
+
// astroPath.node.value.elements.forEach((element) => {
|
|
41
|
+
// if (t.isObjectExpression(element)) {
|
|
42
|
+
// element.properties.forEach((property) => {
|
|
43
|
+
// if (t.isObjectProperty(property) && t.isIdentifier(property.key) && property.key.name === 'renderImporter') {
|
|
44
|
+
// if (
|
|
45
|
+
// t.isArrowFunctionExpression(property.value) &&
|
|
46
|
+
// t.isCallExpression(property.value.body) &&
|
|
47
|
+
// t.isImport(property.value.body.callee)
|
|
48
|
+
// ) {
|
|
49
|
+
// let importPath = (property.value.body.arguments[0] as t.StringLiteral).value;
|
|
50
|
+
// if (importPath.startsWith('.')) {
|
|
51
|
+
// importPath = processImportPaths(importPath, filePath, dist);
|
|
52
|
+
// }
|
|
53
|
+
// const filePathProperty = t.objectProperty(
|
|
54
|
+
// t.identifier(`renderFilePath`),
|
|
55
|
+
// t.stringLiteral(importPath),
|
|
56
|
+
// );
|
|
57
|
+
// element.properties.push(filePathProperty);
|
|
58
|
+
// modified = true;
|
|
59
|
+
// }
|
|
60
|
+
// }
|
|
61
|
+
// });
|
|
62
|
+
// }
|
|
63
|
+
// });
|
|
64
|
+
// }
|
|
65
|
+
// }
|
|
66
|
+
// },
|
|
67
|
+
// });
|
|
68
|
+
// if (modified) {
|
|
69
|
+
// writeModifiedASTToFile(filePath, ast, code);
|
|
70
|
+
// }
|
|
71
|
+
// return null;
|
|
72
|
+
// });
|
|
73
|
+
// }
|
|
74
|
+
async function modifyComputeJs(dist, filter) {
|
|
75
|
+
const pattern = '**/**/compute.js';
|
|
76
|
+
const filesToModify = await glob.glob(path.join(dist, pattern), { absolute: true });
|
|
77
|
+
filesToModify.forEach((filePath) => {
|
|
78
|
+
if (!filter(filePath))
|
|
79
|
+
return;
|
|
80
|
+
const code = fs.readFileSync(filePath, 'utf8');
|
|
81
|
+
const ast = parser.parse(code, {
|
|
82
|
+
sourceType: 'module',
|
|
83
|
+
plugins: ['js', 'dynamicImport'],
|
|
84
|
+
});
|
|
85
|
+
let modified = false;
|
|
86
|
+
traverse(ast, {
|
|
87
|
+
enter(astroPath) {
|
|
88
|
+
if (t__namespace.isObjectProperty(astroPath.node) && t__namespace.isIdentifier(astroPath.node.key)) {
|
|
89
|
+
switch (astroPath.node.key.name) {
|
|
90
|
+
case 'component':
|
|
91
|
+
case 'dialog':
|
|
92
|
+
modified =
|
|
93
|
+
handleComponentOrDialog.handleComponentOrDialog(astroPath, filePath, dist) ||
|
|
94
|
+
modified;
|
|
95
|
+
break;
|
|
96
|
+
case 'importPaths':
|
|
97
|
+
modified =
|
|
98
|
+
handleImportPaths.handleImportPaths(astroPath, filePath, dist) || modified;
|
|
99
|
+
break;
|
|
100
|
+
case 'wrappers':
|
|
101
|
+
if (t__namespace.isArrayExpression(astroPath.node.value)) {
|
|
102
|
+
modified =
|
|
103
|
+
handleWrappers.handleWrappers(astroPath, filePath, dist) || modified;
|
|
104
|
+
}
|
|
105
|
+
break;
|
|
106
|
+
case 'icon':
|
|
107
|
+
if (t__namespace.isObjectExpression(astroPath.node.value)) {
|
|
108
|
+
modified = handleIconSVGFiles.handleIconSVGFiles(astroPath, filePath, dist) || modified;
|
|
109
|
+
}
|
|
110
|
+
break;
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
},
|
|
114
|
+
});
|
|
115
|
+
if (modified) {
|
|
116
|
+
writeModifiedASTToFile(filePath, ast, code);
|
|
117
|
+
}
|
|
118
|
+
return null;
|
|
119
|
+
});
|
|
64
120
|
}exports.default=modifyLibFilesPlugin;//# sourceMappingURL=rollupPluginModifyLibFiles.cjs.map
|