Skip to content

Commit

Permalink
Merge branch 'main' into node-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
florian-lefebvre authored Dec 28, 2023
2 parents 8f7067d + a2977cb commit 9bc9e5c
Show file tree
Hide file tree
Showing 116 changed files with 1,575 additions and 289 deletions.
5 changes: 0 additions & 5 deletions .changeset/beige-zebras-ring.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/blue-ladybugs-march.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/chilly-tips-breathe.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/eight-ears-call.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/forty-actors-wash.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/gold-zebras-burn.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/great-parrots-raise.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/old-goats-occur.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/rare-ants-swim.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/rude-deers-turn.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/shy-knives-unite.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/small-emus-deny.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/small-snakes-build.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"astro": patch
---

Fixes remote images with encoded characters
18 changes: 0 additions & 18 deletions .changeset/soft-sheep-glow.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/tidy-dogs-remain.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/weak-oranges-relate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"astro": patch
---

`<Image />` srcset now parses encoded paths correctly
2 changes: 1 addition & 1 deletion examples/basics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^4.0.7"
"astro": "^4.0.8"
}
}
6 changes: 3 additions & 3 deletions examples/blog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/mdx": "^2.0.2",
"@astrojs/mdx": "^2.0.3",
"@astrojs/rss": "^4.0.1",
"@astrojs/sitemap": "^3.0.3",
"astro": "^4.0.7"
"@astrojs/sitemap": "^3.0.4",
"astro": "^4.0.8"
}
}
2 changes: 1 addition & 1 deletion examples/component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"scripts": {},
"devDependencies": {
"astro": "^4.0.7"
"astro": "^4.0.8"
},
"peerDependencies": {
"astro": "^3.0.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/framework-alpine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/alpinejs": "^0.3.1",
"@astrojs/alpinejs": "^0.3.2",
"@types/alpinejs": "^3.13.5",
"alpinejs": "^3.13.3",
"astro": "^4.0.7"
"astro": "^4.0.8"
}
}
4 changes: 2 additions & 2 deletions examples/framework-lit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/lit": "^4.0.0",
"@astrojs/lit": "^4.0.1",
"@webcomponents/template-shadowroot": "^0.2.1",
"astro": "^4.0.7",
"astro": "^4.0.8",
"lit": "^2.8.0"
}
}
12 changes: 6 additions & 6 deletions examples/framework-multiple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/preact": "^3.0.1",
"@astrojs/react": "^3.0.8",
"@astrojs/solid-js": "^3.0.2",
"@astrojs/svelte": "^5.0.2",
"@astrojs/vue": "^4.0.5",
"astro": "^4.0.7",
"@astrojs/preact": "^3.0.2",
"@astrojs/react": "^3.0.9",
"@astrojs/solid-js": "^3.0.3",
"@astrojs/svelte": "^5.0.3",
"@astrojs/vue": "^4.0.6",
"astro": "^4.0.8",
"preact": "^10.19.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/framework-preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/preact": "^3.0.1",
"@astrojs/preact": "^3.0.2",
"@preact/signals": "^1.2.1",
"astro": "^4.0.7",
"astro": "^4.0.8",
"preact": "^10.19.2"
}
}
4 changes: 2 additions & 2 deletions examples/framework-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/react": "^3.0.8",
"@astrojs/react": "^3.0.9",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"astro": "^4.0.7",
"astro": "^4.0.8",
"react": "^18.2.0",
"react-dom": "^18.2.0"
}
Expand Down
4 changes: 2 additions & 2 deletions examples/framework-solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/solid-js": "^3.0.2",
"astro": "^4.0.7",
"@astrojs/solid-js": "^3.0.3",
"astro": "^4.0.8",
"solid-js": "^1.8.5"
}
}
4 changes: 2 additions & 2 deletions examples/framework-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/svelte": "^5.0.2",
"astro": "^4.0.7",
"@astrojs/svelte": "^5.0.3",
"astro": "^4.0.8",
"svelte": "^4.2.5"
}
}
4 changes: 2 additions & 2 deletions examples/framework-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/vue": "^4.0.5",
"astro": "^4.0.7",
"@astrojs/vue": "^4.0.6",
"astro": "^4.0.8",
"vue": "^3.3.8"
}
}
4 changes: 2 additions & 2 deletions examples/hackernews/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/node": "^7.0.2",
"astro": "^4.0.7"
"@astrojs/node": "^7.0.3",
"astro": "^4.0.8"
}
}
4 changes: 2 additions & 2 deletions examples/integration/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ export default function createIntegration(): AstroIntegration {
// See the @astrojs/react integration for an example
// https://github.com/withastro/astro/blob/main/packages/integrations/react/src/index.ts
},
'astro:build:setup': ({ pages, updateConfig }) => {
'astro:build:setup': () => {
// See the @astrojs/lit integration for an example
// https://github.com/withastro/astro/blob/main/packages/integrations/lit/src/index.ts
},
'astro:build:done': ({ dir, routes }) => {
'astro:build:done': () => {
// See the @astrojs/partytown integration for an example
// https://github.com/withastro/astro/blob/main/packages/integrations/partytown/src/index.ts
},
Expand Down
2 changes: 1 addition & 1 deletion examples/integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"scripts": {},
"devDependencies": {
"astro": "^4.0.7"
"astro": "^4.0.8"
},
"peerDependencies": {
"astro": "^3.0.0"
Expand Down
7 changes: 5 additions & 2 deletions examples/middleware/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@
"server": "node dist/server/entry.mjs"
},
"dependencies": {
"@astrojs/node": "^7.0.2",
"astro": "^4.0.7",
"@astrojs/node": "^7.0.3",
"astro": "^4.0.8",
"html-minifier": "^4.0.0"
},
"devDependencies": {
"@types/html-minifier": "^4.0.5"
}
}
7 changes: 5 additions & 2 deletions examples/middleware/src/middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@ import htmlMinifier from 'html-minifier';

const limit = 50;

const loginInfo = {
const loginInfo: {
token: undefined | string;
currentTime: undefined | number;
} = {
token: undefined,
currentTime: undefined,
};

export const minifier = defineMiddleware(async (context, next) => {
export const minifier = defineMiddleware(async (_context, next) => {
const response = await next();
// check if the response is returning some HTML
if (response.headers.get('content-type') === 'text/html') {
Expand Down
2 changes: 1 addition & 1 deletion examples/minimal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^4.0.7"
"astro": "^4.0.8"
}
}
2 changes: 1 addition & 1 deletion examples/non-html-pages/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^4.0.7"
"astro": "^4.0.8"
}
}
2 changes: 1 addition & 1 deletion examples/portfolio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^4.0.7"
"astro": "^4.0.8"
}
}
6 changes: 3 additions & 3 deletions examples/ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"server": "node dist/server/entry.mjs"
},
"dependencies": {
"@astrojs/node": "^7.0.2",
"@astrojs/svelte": "^5.0.2",
"astro": "^4.0.7",
"@astrojs/node": "^7.0.3",
"@astrojs/svelte": "^5.0.3",
"astro": "^4.0.8",
"svelte": "^4.2.5"
}
}
2 changes: 1 addition & 1 deletion examples/ssr/src/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ async function get<T>(
});
if (!response.ok) {
// TODO make this better...
return null;
throw new Error('Fetch failed');
}
return cb(response);
}
Expand Down
4 changes: 2 additions & 2 deletions examples/ssr/src/pages/api/cart.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { APIContext } from 'astro';
import type { APIContext } from 'astro';
import { userCartItems } from '../../models/session';

export function GET({ cookies }: APIContext) {
Expand All @@ -21,7 +21,7 @@ interface AddToCartItem {
export async function POST({ cookies, request }: APIContext) {
const item: AddToCartItem = await request.json();

let userId = cookies.get('user-id').value;
let userId = cookies.get('user-id')?.value;

if (!userCartItems.has(userId)) {
userCartItems.set(userId, new Map());
Expand Down
2 changes: 1 addition & 1 deletion examples/ssr/src/pages/login.form.async.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { APIContext, APIRoute } from 'astro';
import type { APIContext, APIRoute } from 'astro';

export const POST: APIRoute = ({ cookies }: APIContext) => {
// add a new cookie
Expand Down
2 changes: 1 addition & 1 deletion examples/ssr/src/pages/login.form.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { APIContext } from 'astro';
import type { APIContext } from 'astro';

export function POST({ cookies }: APIContext) {
// add a new cookie
Expand Down
7 changes: 7 additions & 0 deletions examples/starlog/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Starlog

## Release notes theme for Astro

![starlog-gh](https://github.com/doodlemarks/starlog/assets/2244813/9c5c2e46-665a-437e-a971-053db4dbff63)

Built with Astro and Sass. Supports both dark and light modes.
6 changes: 6 additions & 0 deletions examples/starlog/astro.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { defineConfig } from 'astro/config';

// https://astro.build/config
export default defineConfig({
site: 'https://example.com',
});
Loading

0 comments on commit 9bc9e5c

Please sign in to comment.