@maravilla-labs/adapter-sveltekit 0.1.13 → 0.1.14
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/dist/index.d.ts.map +1 -1
- package/dist/index.js +32 -2
- package/dist/index.js.map +1 -1
- package/dist/merge-functions.js +5 -41
- package/dist/merge-functions.js.map +1 -1
- package/package.json +8 -3
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAW,MAAM,eAAe,CAAC;AAEtD,UAAU,cAAc;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAgCD,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,GAAE,cAAmB,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAW,MAAM,eAAe,CAAC;AAEtD,UAAU,cAAc;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAgCD,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,GAAE,cAAmB,GAAG,OAAO,CA+PrE"}
|
package/dist/index.js
CHANGED
|
@@ -193,9 +193,39 @@ export default function adapter(options = {}) {
|
|
|
193
193
|
// Integrate functions into manifest if they exist
|
|
194
194
|
if (functionsManifest) {
|
|
195
195
|
await integrateWithManifest(`${out}/manifest.json`, functionsManifest);
|
|
196
|
-
|
|
197
|
-
const { mergeFunctions } = await import('./merge-functions.js'); // emitted from TS source merge-functions.ts
|
|
196
|
+
const { mergeFunctions } = await import('./merge-functions.js');
|
|
198
197
|
mergeFunctions(out);
|
|
198
|
+
try {
|
|
199
|
+
const fsMod = await import('node:fs');
|
|
200
|
+
const pathMod = await import('node:path');
|
|
201
|
+
const mPath = pathMod.join(out, 'manifest.json');
|
|
202
|
+
const raw = fsMod.readFileSync(mPath, 'utf8');
|
|
203
|
+
const m = JSON.parse(raw);
|
|
204
|
+
if (m.functions?.routes) {
|
|
205
|
+
// Build a map from path -> route object with name/file
|
|
206
|
+
const routeMap = new Map(m.functions.routes.map((r) => [r.path, r]));
|
|
207
|
+
if (Array.isArray(m.routing?.functions)) {
|
|
208
|
+
m.routing.functions = m.routing.functions.map((r) => {
|
|
209
|
+
const full = routeMap.get(r.path) || {};
|
|
210
|
+
return { ...r, name: full.name, file: full.file };
|
|
211
|
+
});
|
|
212
|
+
}
|
|
213
|
+
else {
|
|
214
|
+
// If missing, synthesize from functions.routes
|
|
215
|
+
m.routing.functions = m.functions.routes.map((r) => ({
|
|
216
|
+
path: r.path,
|
|
217
|
+
name: r.name,
|
|
218
|
+
methods: r.methods,
|
|
219
|
+
file: r.file,
|
|
220
|
+
handler: 'function'
|
|
221
|
+
}));
|
|
222
|
+
}
|
|
223
|
+
fsMod.writeFileSync(mPath, JSON.stringify(m, null, 2));
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
catch (e) {
|
|
227
|
+
builder.log.warn('Failed to augment routing.functions with name/file: ' + e?.message);
|
|
228
|
+
}
|
|
199
229
|
}
|
|
200
230
|
builder.log.minor(`Build complete. Output written to ${out}`);
|
|
201
231
|
builder.log.minor('');
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC3E,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAmBnC,KAAK,UAAU,gBAAgB;IAC7B,MAAM,SAAS,GAAG;QAChB,2BAA2B,EAAE,6CAA6C;QAC1E,+BAA+B,EAAE,yBAAyB;QAC1D,8BAA8B,EAAE,4BAA4B;KAC7D,CAAC;IACF,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,IAAI,CAAC;YACH,MAAM,GAAG,GAAQ,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;YACpC,IAAI,GAAG,CAAC,cAAc,IAAI,GAAG,CAAC,qBAAqB,EAAE,CAAC;gBACpD,OAAO,EAAE,cAAc,EAAE,GAAG,CAAC,cAAc,EAAE,qBAAqB,EAAE,GAAG,CAAC,qBAAqB,EAAE,CAAC;YAClG,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC;IAChC,CAAC;IACD,iDAAiD;IACjD,OAAO;QACL,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI;QAChC,qBAAqB,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;KACtC,CAAC;AACJ,CAAC;AAED,+EAA+E;AAC/E,MAAM,sBAAsB,GAAG,ojKAAojK,CAAC;AAEplK,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,UAA0B,EAAE;IAC1D,MAAM,EACJ,GAAG,GAAG,YAAY,EAClB,WAAW,GAAG,KAAK,EACnB,SAAS,GAAG,SAAS,EACrB,QAAQ,GAAG,IAAI,EACf,OAAO,GAAG,EAAE,EACZ,OAAO,GAAG,EAAE,EACZ,QAAQ,GAAG,EAAE,EACd,GAAG,OAAO,CAAC;IAEZ,OAAO;QACL,IAAI,EAAE,mCAAmC;QAEzC,KAAK,CAAC,KAAK,CAAC,OAAgB;YAC9B,qFAAqF;YACrF,MAAM,EAAE,cAAc,EAAE,qBAAqB,EAAE,GAAG,MAAM,gBAAgB,EAAE,CAAC;YACvE,MAAM,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;YAE3D,2BAA2B;YAC3B,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAEpB,kBAAkB;YAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;YAE1D,sBAAsB;YACtB,MAAM,gBAAgB,GAAG,GAAG,GAAG,SAAS,CAAC;YACzC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAC3C,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;YACtC,OAAO,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;YAE3C,6BAA6B;YAC7B,IAAI,WAAW,EAAE,CAAC;gBAChB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;gBACxC,MAAM,OAAO,CAAC,GAAG,CAAC;oBAChB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;iBACnC,CAAC,CAAC;YACL,CAAC;YAED,eAAe;YACf,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YACrC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YAEzB,oBAAoB;YACpB,aAAa,CACX,GAAG,GAAG,cAAc,EACpB;gBACE,2BAA2B,OAAO,CAAC,gBAAgB,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,GAAG;gBAC9E,sCAAsC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI;gBACnF,uBAAuB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG;aACxE,CAAC,IAAI,CAAC,MAAM,CAAC,CACf,CAAC;YAEF,MAAM,WAAW,GAAG,sBAAsB;iBACvC,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC;iBACnC,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;YAE5C,aAAa,CAAC,GAAG,GAAG,YAAY,EAAE,WAAW,CAAC,CAAC;YAE/C,sBAAsB;YACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAE3C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC;gBACjC,WAAW,EAAE,CAAC,GAAG,GAAG,YAAY,CAAC;gBACjC,OAAO,EAAE,GAAG,GAAG,YAAY;gBAC3B,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,SAAS;gBACnB,MAAM,EAAE,KAAK;gBACb,MAAM,EAAE,QAAQ;gBACtB,qGAAqG;gBACrG,UAAU,EAAE,CAAC,QAAQ,EAAC,MAAM,CAAC;gBACvB,UAAU,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC;gBACnC,QAAQ,EAAE;oBACR,GAAG,QAAQ;oBACX,+DAA+D;oBAC/D,qBAAqB;iBACtB;gBACD,MAAM,EAAE;oBACN,sBAAsB,EAAE,cAAc;iBACvC;gBACD,MAAM,EAAE,IAAI;gBACZ,SAAS,EAAE,IAAI;gBACf,QAAQ,EAAE,IAAI;gBACd,QAAQ,EAAE,MAAM;aACjB,CAAC,CAAC;YAEH,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACpB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAChE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC9B,CAAC;YAED,8CAA8C;YAC9C,MAAM,YAAY,GAAa,EAAE,CAAC;YAClC,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,MAAM,GAAG,EAAE,EAAE,EAAE;gBACjD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;oBAAE,OAAO;gBAE7B,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;gBAC/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;oBACzB,MAAM,QAAQ,GAAG,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;oBAClC,MAAM,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;oBAEzD,IAAI,CAAC;wBACH,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;4BACrC,aAAa,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;wBACxC,CAAC;6BAAM,CAAC;4BACN,YAAY,CAAC,IAAI,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;wBACxC,CAAC;oBACH,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;gBAChB,CAAC;YACH,CAAC,CAAC;YACF,aAAa,CAAC,gBAAgB,CAAC,CAAC;YAEhC,qDAAqD;YACrD,yCAAyC;YACzC,MAAM,YAAY,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC;YAClD,IAAI,iBAAiB,GAAG,IAAI,CAAC;YAE7B,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC7B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,GAAG,YAAY,CAAC,CAAC;gBACnE,IAAI,CAAC;oBACH,iBAAiB,GAAG,MAAM,cAAc,CAAC;wBACvC,YAAY;wBACZ,SAAS,EAAE,GAAG;wBACd,UAAU,EAAE,IAAI;wBAChB,MAAM,EAAE,IAAI;qBACb,CAAC,CAAC;gBACL,CAAC;gBAAC,OAAO,KAAU,EAAE,CAAC;oBACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,GAAG,CAAC,KAAK,EAAE,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC;gBAC/E,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;YAC9E,CAAC;YAED,2CAA2C;YAC3C,MAAM,gBAAgB,GAAG;gBACvB,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,WAAW;gBACpB,UAAU,EAAE,WAAW;gBACvB,MAAM,EAAE,QAAQ;gBAEhB,sCAAsC;gBACtC,OAAO,EAAE;oBACP,sDAAsD;oBACtD,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;wBAChD,6CAA6C;wBAC7C,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;4BACjB,OAAO,aAAa,CAAC;wBACvB,CAAC;wBACD,sCAAsC;wBACtC,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC;oBAC3C,CAAC,CAAC;oBAEF,8DAA8D;oBAC9D,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CACjC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;wBACzB,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;wBAC3B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;wBACrB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;wBACrB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;wBACrB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;wBACrB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CACvB;oBAED,uDAAuD;oBACvD,OAAO,EAAE;wBACP,GAAG,EAAE,QAAQ,EAAS,aAAa;wBACnC,YAAY,EAAE,IAAI,CAAI,qCAAqC;qBAC5D;iBACF;gBAED,2CAA2C;gBAC3C,MAAM,EAAE;oBACN,OAAO,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;oBAC9C,OAAO,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;iBAC3C;gBAED,GAAG,EAAE;oBACH,MAAM,EAAE,SAAS;iBAClB;gBAED,QAAQ,EAAE;oBACR,GAAG,EAAE,IAAI;oBACT,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;oBAClD,QAAQ;oBACR,2BAA2B;oBAC3B,SAAS,EAAE,IAAI;oBACf,WAAW,EAAE,WAAW;iBACzB;gBAED,iBAAiB;gBACjB,QAAQ,EAAE;oBACR,OAAO,EAAE,8BAA8B;oBACvC,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,IAAI,SAAS;oBACpD,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;oBACpC,iBAAiB,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM;oBACnD,WAAW,EAAE,YAAY,CAAC,MAAM;iBACjC;aACF,CAAC;YAEF,aAAa,CACX,GAAG,GAAG,gBAAgB,EACtB,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,CAC1C,CAAC;YAEF,kDAAkD;YAClD,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM,qBAAqB,CAAC,GAAG,GAAG,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/merge-functions.js
CHANGED
|
@@ -1,58 +1,22 @@
|
|
|
1
1
|
import { readFileSync, writeFileSync, existsSync } from 'fs';
|
|
2
2
|
import { join } from 'path';
|
|
3
3
|
/**
|
|
4
|
-
*
|
|
4
|
+
* Keep functions separate from server bundle for proper routing
|
|
5
5
|
*/
|
|
6
6
|
export function mergeFunctions(buildDir) {
|
|
7
|
-
const serverPath = join(buildDir, 'server.js');
|
|
8
7
|
const functionsPath = join(buildDir, 'functions.js');
|
|
9
8
|
const manifestPath = join(buildDir, 'manifest.json');
|
|
10
9
|
if (!existsSync(functionsPath)) {
|
|
11
10
|
console.log('No functions bundle found, skipping merge');
|
|
12
11
|
return;
|
|
13
12
|
}
|
|
14
|
-
const serverCode = readFileSync(serverPath, 'utf8');
|
|
15
|
-
const functionsCode = readFileSync(functionsPath, 'utf8');
|
|
16
13
|
const manifest = JSON.parse(readFileSync(manifestPath, 'utf8'));
|
|
17
|
-
|
|
18
|
-
// === FUNCTIONS BUNDLE START ===
|
|
19
|
-
${functionsCode}
|
|
20
|
-
|
|
21
|
-
// === SERVER BUNDLE START ===
|
|
22
|
-
${serverCode}
|
|
23
|
-
|
|
24
|
-
// === FUNCTION ROUTING INTEGRATION ===
|
|
25
|
-
(function() {
|
|
26
|
-
const originalHandleRequest = (globalThis as any).handleRequest;
|
|
27
|
-
(globalThis as any).handleRequest = async function(request: Request) {
|
|
28
|
-
const url = new URL(request.url);
|
|
29
|
-
const path = url.pathname;
|
|
30
|
-
const functionRoutes = ${'${JSON.stringify(manifest.functions?.routes || [])}'};
|
|
31
|
-
for (const route of functionRoutes) {
|
|
32
|
-
if (path === route.path || path.startsWith(route.path + '/')) {
|
|
33
|
-
console.log('[Functions] Handling function request:', path);
|
|
34
|
-
if (typeof (globalThis as any).handleFunctionRequest === 'function') {
|
|
35
|
-
try {
|
|
36
|
-
return await (globalThis as any).handleFunctionRequest(request);
|
|
37
|
-
} catch (error: any) {
|
|
38
|
-
console.error('[Functions] Error handling function:', error);
|
|
39
|
-
return new Response(
|
|
40
|
-
JSON.stringify({ error: 'Function execution failed', message: error.message }),
|
|
41
|
-
{ status: 500, headers: { 'content-type': 'application/json' } }
|
|
42
|
-
);
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
return originalHandleRequest(request);
|
|
48
|
-
};
|
|
49
|
-
})();
|
|
50
|
-
`;
|
|
51
|
-
writeFileSync(serverPath, mergedCode);
|
|
52
|
-
console.log('✅ Functions merged into server bundle');
|
|
14
|
+
// Mark functions as available but NOT integrated into server bundle
|
|
53
15
|
if (manifest.functions) {
|
|
54
|
-
manifest.functions.integrated =
|
|
16
|
+
manifest.functions.integrated = false;
|
|
17
|
+
manifest.functions.available = true;
|
|
55
18
|
}
|
|
56
19
|
writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
|
|
20
|
+
console.log('✅ Functions kept separate from server bundle for proper routing');
|
|
57
21
|
}
|
|
58
22
|
//# sourceMappingURL=merge-functions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-functions.js","sourceRoot":"","sources":["../src/merge-functions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,MAAM,
|
|
1
|
+
{"version":3,"file":"merge-functions.js","sourceRoot":"","sources":["../src/merge-functions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IAErD,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC;QACzD,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;IAEhE,oEAAoE;IACpE,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;QACvB,QAAQ,CAAC,SAAS,CAAC,UAAU,GAAG,KAAK,CAAC;QACtC,QAAQ,CAAC,SAAS,CAAC,SAAS,GAAG,IAAI,CAAC;IACtC,CAAC;IAED,aAAa,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/D,OAAO,CAAC,GAAG,CAAC,iEAAiE,CAAC,CAAC;AACjF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@maravilla-labs/adapter-sveltekit",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.14",
|
|
4
4
|
"description": "SvelteKit adapter for Maravilla Runtime",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -38,7 +38,13 @@
|
|
|
38
38
|
"access": "public"
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
|
41
|
-
"@sveltejs/kit": "^2.0.0"
|
|
41
|
+
"@sveltejs/kit": "^2.0.0",
|
|
42
|
+
"@maravilla-labs/functions": "*"
|
|
43
|
+
},
|
|
44
|
+
"peerDependenciesMeta": {
|
|
45
|
+
"@maravilla-labs/functions": {
|
|
46
|
+
"optional": true
|
|
47
|
+
}
|
|
42
48
|
},
|
|
43
49
|
"devDependencies": {
|
|
44
50
|
"@sveltejs/kit": "^2.0.0",
|
|
@@ -47,7 +53,6 @@
|
|
|
47
53
|
"vitest": "^1.0.0"
|
|
48
54
|
},
|
|
49
55
|
"dependencies": {
|
|
50
|
-
"@maravilla-labs/functions": "latest",
|
|
51
56
|
"esbuild": "^0.25.0",
|
|
52
57
|
"set-cookie-parser": "^2.6.0"
|
|
53
58
|
}
|