Skip to content
This repository was archived by the owner on Feb 10, 2025. It is now read-only.

Commit d731985

Browse files
ascorbicascorbic
committed
Use experimental release
1 parent 6373fca commit d731985

File tree

53 files changed

+102
-235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+102
-235
lines changed

Diff for: ‎packages/cloudflare/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646
"wrangler": "^3.91.0"
4747
},
4848
"peerDependencies": {
49-
"astro": "^5.0.0"
49+
"astro": "0.0.0-sessions-20241205163205"
5050
},
5151
"devDependencies": {
5252
"@astrojs/test-utils": "workspace:*",
53-
"astro": "^5.0.0",
53+
"astro": "0.0.0-sessions-20241205163205",
5454
"astro-scripts": "workspace:*",
5555
"cheerio": "1.0.0",
5656
"execa": "^8.0.1",

Diff for: ‎packages/cloudflare/test/fixtures/astro-dev-platform/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"dependencies": {
66
"@astrojs/cloudflare": "workspace:*",
7-
"astro": "0.0.0-sessions-20241128134018"
7+
"astro": "0.0.0-sessions-20241205163205"
88
},
99
"devDependencies": {
1010
"wrangler": "^3.84.0"

Diff for: ‎packages/cloudflare/test/fixtures/astro-env/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"dependencies": {
66
"@astrojs/cloudflare": "workspace:*",
7-
"astro": "0.0.0-sessions-20241128134018"
7+
"astro": "0.0.0-sessions-20241205163205"
88
},
99
"devDependencies": {
1010
"wrangler": "^3.84.0"

Diff for: ‎packages/cloudflare/test/fixtures/compile-image-service/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"private": true,
55
"dependencies": {
66
"@astrojs/cloudflare": "workspace:*",
7-
"astro": "0.0.0-sessions-20241128134018"
7+
"astro": "0.0.0-sessions-20241205163205"
88
}
99
}

Diff for: ‎packages/cloudflare/test/fixtures/external-image-service/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"private": true,
55
"dependencies": {
66
"@astrojs/cloudflare": "workspace:*",
7-
"astro": "0.0.0-sessions-20241128134018"
7+
"astro": "0.0.0-sessions-20241205163205"
88
}
99
}

Diff for: ‎packages/cloudflare/test/fixtures/module-loader/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"private": true,
55
"dependencies": {
66
"@astrojs/cloudflare": "workspace:*",
7-
"astro": "0.0.0-sessions-20241128134018"
7+
"astro": "0.0.0-sessions-20241205163205"
88
}
99
}

Diff for: ‎packages/cloudflare/test/fixtures/no-output/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"private": true,
55
"dependencies": {
66
"@astrojs/cloudflare": "workspace:*",
7-
"astro": "0.0.0-sessions-20241128134018"
7+
"astro": "0.0.0-sessions-20241205163205"
88
}
99
}

Diff for: ‎packages/cloudflare/test/fixtures/routes-json/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"private": true,
55
"dependencies": {
66
"@astrojs/cloudflare": "workspace:*",
7-
"astro": "0.0.0-sessions-20241128134018"
7+
"astro": "0.0.0-sessions-20241205163205"
88
}
99
}

Diff for: ‎packages/cloudflare/test/fixtures/with-solid-js/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"dependencies": {
66
"@astrojs/cloudflare": "workspace:*",
77
"@astrojs/solid-js": "^4.4.2",
8-
"astro": "0.0.0-sessions-20241128134018",
8+
"astro": "0.0.0-sessions-20241205163205",
99
"solid-js": "^1.9.3"
1010
}
1111
}

Diff for: ‎packages/cloudflare/test/fixtures/with-svelte/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"dependencies": {
66
"@astrojs/cloudflare": "workspace:*",
77
"@astrojs/svelte": "^7.0.1",
8-
"astro": "^5.0.0",
8+
"astro": "0.0.0-sessions-20241205163205",
99
"svelte": "^5.6.0"
1010
}
11-
}
11+
}

Diff for: ‎packages/cloudflare/test/fixtures/wrangler-preview-platform/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"private": true,
55
"dependencies": {
66
"@astrojs/cloudflare": "workspace:*",
7-
"astro": "0.0.0-sessions-20241128134018"
7+
"astro": "0.0.0-sessions-20241205163205"
88
}
99
}

Diff for: ‎packages/netlify/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@
4545
"vite": "^6.0.2"
4646
},
4747
"peerDependencies": {
48-
"astro": "^5.0.0"
48+
"astro": "0.0.0-sessions-20241205163205"
4949
},
5050
"devDependencies": {
5151
"@astrojs/test-utils": "workspace:*",
5252
"@netlify/edge-functions": "^2.11.1",
5353
"@netlify/edge-handler-types": "^0.34.1",
5454
"@types/node": "^22.10.0",
55-
"astro": "0.0.0-sessions-20241128172109",
55+
"astro": "0.0.0-sessions-20241205163205",
5656
"astro-scripts": "workspace:*",
5757
"cheerio": "1.0.0",
5858
"execa": "^8.0.1",

Diff for: ‎packages/netlify/src/index.ts

+5-19
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,18 @@ export default function netlifyIntegration(
280280

281281
async function writeMiddleware(entrypoint: URL) {
282282
await mkdir(middlewareOutputDir(), { recursive: true });
283-
console.log(_config.experimental?.session);
284283
await writeFile(
285284
new URL('./entry.mjs', middlewareOutputDir()),
286285
/* ts */ `
287-
import { onRequest, getManifest } from "${fileURLToPath(entrypoint).replaceAll('\\', '/')}";
286+
import { onRequest } from "${fileURLToPath(entrypoint).replaceAll('\\', '/')}";
288287
import { createContext, trySerializeLocals } from 'astro/middleware';
289288
290289
export default async (request, context) => {
291-
const manifest = await getManifest();
292290
const ctx = createContext({
293291
request,
294-
params: {},
295-
manifest
292+
params: {}
296293
});
297-
298-
ctx.locals.netlify = { context }
294+
ctx.locals = { netlify: { context } }
299295
// https://docs.netlify.com/edge-functions/api/#return-a-rewrite
300296
ctx.rewrite = (target) => {
301297
if(target instanceof Request) {
@@ -317,10 +313,6 @@ export default function netlifyIntegration(
317313
};
318314
const next = () => {
319315
const { netlify, ...otherLocals } = ctx.locals;
320-
const data = Reflect.get(ctx.session, "data");
321-
if(data) {
322-
request.headers.set("x-astro-session", trySerializeLocals(data));
323-
}
324316
request.headers.set("x-astro-locals", trySerializeLocals(otherLocals));
325317
request.headers.set("x-astro-middleware-secret", "${middlewareSecret}");
326318
return context.next();
@@ -349,14 +341,6 @@ export default function netlifyIntegration(
349341
path: args.path,
350342
external: true,
351343
}));
352-
build.onResolve({ filter: /^@astro-session-driver$/ }, async (args) => {
353-
const resolved = await build.resolve('unstorage/drivers/netlify-blobs', {
354-
kind: 'import-statement',
355-
resolveDir: args.resolveDir,
356-
});
357-
console.log(resolved);
358-
return resolved;
359-
});
360344
},
361345
},
362346
],
@@ -390,6 +374,8 @@ export default function netlifyIntegration(
390374
account: parseBase64JSON('x-nf-account-info') ?? {
391375
id: 'mock-netlify-account-id',
392376
},
377+
// TODO: this has type conflicts with @netlify/functions ^2.8.1
378+
// @ts-expect-error: this has type conflicts with @netlify/functions ^2.8.1
393379
deploy: {
394380
id:
395381
typeof req.headers['x-nf-deploy-id'] === 'string'

Diff for: ‎packages/netlify/src/ssr-function.ts

+5-14
Original file line numberDiff line numberDiff line change
@@ -32,30 +32,21 @@ export const createExports = (manifest: SSRManifest, { middlewareSecret }: Args)
3232

3333
Reflect.set(request, clientAddressSymbol, context.ip);
3434
let locals: Record<string, unknown> = {};
35-
let initialSessionData: Record<string, unknown> = {};
3635

3736
const astroLocalsHeader = request.headers.get('x-astro-locals');
38-
const astroSessionHeader = request.headers.get('x-astro-session');
3937
const middlewareSecretHeader = request.headers.get('x-astro-middleware-secret');
40-
// hide the secret from the rest of user and library code
41-
request.headers.delete('x-astro-middleware-secret');
42-
if (astroLocalsHeader || astroSessionHeader) {
38+
if (astroLocalsHeader) {
4339
if (middlewareSecretHeader !== middlewareSecret) {
4440
return new Response('Forbidden', { status: 403 });
4541
}
46-
47-
if (astroLocalsHeader) {
48-
locals = JSON.parse(astroLocalsHeader);
49-
}
50-
if (astroSessionHeader) {
51-
console.log('astroSessionHeader', astroSessionHeader);
52-
initialSessionData = JSON.parse(astroSessionHeader);
53-
}
42+
// hide the secret from the rest of user and library code
43+
request.headers.delete('x-astro-middleware-secret');
44+
locals = JSON.parse(astroLocalsHeader);
5445
}
5546

5647
locals.netlify = { context };
5748

58-
const response = await app.render(request, { routeData, locals, initialSessionData });
49+
const response = await app.render(request, { routeData, locals });
5950

6051
if (app.setCookieHeaders) {
6152
for (const setCookieHeader of app.setCookieHeaders(response)) {

Diff for: ‎packages/netlify/test/functions/fixtures/session/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"@astrojs/netlify": "workspace:*"
77
},
88
"devDependencies": {
9-
"astro": "0.0.0-sessions-20241128172109"
9+
"astro": "0.0.0-sessions-20241205163205"
1010
},
1111
"scripts": {
1212
"build": "astro build",

Diff for: ‎packages/netlify/test/hosted/hosted-astro-project/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
},
88
"dependencies": {
99
"@astrojs/netlify": "workspace:*",
10-
"astro": "^5.0.0"
10+
"astro": "0.0.0-sessions-20241205163205"
1111
}
1212
}

Diff for: ‎packages/node/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
"server-destroy": "^1.0.1"
3636
},
3737
"peerDependencies": {
38-
"astro": "^5.0.0"
38+
"astro": "0.0.0-sessions-20241205163205"
3939
},
4040
"devDependencies": {
4141
"@astrojs/test-utils": "workspace:*",
4242
"@types/node": "^22.10.0",
4343
"@types/send": "^0.17.4",
4444
"@types/server-destroy": "^1.0.4",
45-
"astro": "^5.0.0",
45+
"astro": "0.0.0-sessions-20241205163205",
4646
"astro-scripts": "workspace:*",
4747
"cheerio": "1.0.0",
4848
"express": "^4.21.1",

Diff for: ‎packages/node/test/fixtures/api-route/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6-
"astro": "0.0.0-sessions-20241128134018",
6+
"astro": "0.0.0-sessions-20241205163205",
77
"@astrojs/node": "workspace:*"
88
}
99
}

Diff for: ‎packages/node/test/fixtures/bad-urls/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6-
"astro": "0.0.0-sessions-20241128134018",
6+
"astro": "0.0.0-sessions-20241205163205",
77
"@astrojs/node": "workspace:*"
88
}
99
}

Diff for: ‎packages/node/test/fixtures/encoded/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6-
"astro": "0.0.0-sessions-20241128134018",
6+
"astro": "0.0.0-sessions-20241205163205",
77
"@astrojs/node": "workspace:*"
88
}
99
}

Diff for: ‎packages/node/test/fixtures/errors/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6-
"astro": "0.0.0-sessions-20241128134018",
6+
"astro": "0.0.0-sessions-20241205163205",
77
"@astrojs/node": "workspace:*"
88
}
99
}

Diff for: ‎packages/node/test/fixtures/headers/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6-
"astro": "0.0.0-sessions-20241128134018",
6+
"astro": "0.0.0-sessions-20241205163205",
77
"@astrojs/node": "workspace:*"
88
}
99
}

Diff for: ‎packages/node/test/fixtures/image/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6-
"astro": "0.0.0-sessions-20241128134018",
6+
"astro": "0.0.0-sessions-20241205163205",
77
"@astrojs/node": "workspace:*"
88
},
99
"peerDependencies": {

Diff for: ‎packages/node/test/fixtures/locals/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6-
"astro": "0.0.0-sessions-20241128134018",
6+
"astro": "0.0.0-sessions-20241205163205",
77
"@astrojs/node": "workspace:*"
88
}
99
}

Diff for: ‎packages/node/test/fixtures/node-middleware/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6-
"astro": "0.0.0-sessions-20241128134018",
6+
"astro": "0.0.0-sessions-20241205163205",
77
"@astrojs/node": "workspace:*"
88
}
99
}

Diff for: ‎packages/node/test/fixtures/prerender-404-500/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"type": "module",
66
"dependencies": {
7-
"astro": "0.0.0-sessions-20241128134018",
7+
"astro": "0.0.0-sessions-20241205163205",
88
"@astrojs/node": "workspace:*"
99
}
1010
}

Diff for: ‎packages/node/test/fixtures/prerender/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6-
"astro": "0.0.0-sessions-20241128134018",
6+
"astro": "0.0.0-sessions-20241205163205",
77
"@astrojs/node": "workspace:*"
88
}
99
}

Diff for: ‎packages/node/test/fixtures/preview-headers/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6-
"astro": "0.0.0-sessions-20241128134018",
6+
"astro": "0.0.0-sessions-20241205163205",
77
"@astrojs/node": "workspace:*"
88
}
99
}

Diff for: ‎packages/node/test/fixtures/session/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"private": true,
55
"dependencies": {
66
"@astrojs/node": "workspace:*",
7-
"astro": "0.0.0-sessions-20241128134018"
7+
"astro": "0.0.0-sessions-20241205163205"
88
}
99
}

Diff for: ‎packages/node/test/fixtures/trailing-slash/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6-
"astro": "0.0.0-sessions-20241128134018",
6+
"astro": "0.0.0-sessions-20241205163205",
77
"@astrojs/node": "workspace:*"
88
}
99
}

Diff for: ‎packages/node/test/fixtures/url/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6-
"astro": "0.0.0-sessions-20241128134018",
6+
"astro": "0.0.0-sessions-20241205163205",
77
"@astrojs/node": "workspace:*"
88
}
99
}

0 commit comments

Comments
 (0)