From c0099703338cf81e2b381e6e754c73b442db4eab Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Mon, 8 May 2023 19:33:08 +0800 Subject: [PATCH 1/3] Fix `astro:assets` SSR error (#7034) --- .changeset/green-chefs-build.md | 5 +++++ packages/astro/src/core/create-vite.ts | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 .changeset/green-chefs-build.md diff --git a/.changeset/green-chefs-build.md b/.changeset/green-chefs-build.md new file mode 100644 index 000000000000..d1669c826643 --- /dev/null +++ b/.changeset/green-chefs-build.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fix `astro:assets` SSR error diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts index ab7208b7d01c..89dec9d4b3af 100644 --- a/packages/astro/src/core/create-vite.ts +++ b/packages/astro/src/core/create-vite.ts @@ -58,6 +58,8 @@ const ONLY_DEV_EXTERNAL = [ 'shiki', // Imported by `@astrojs/prism` which exposes `` that is processed by Vite 'prismjs/components/index.js', + // Imported by `astro/assets` -> `packages/astro/src/core/logger/core.ts` + 'string-width', ]; /** Return a common starting point for all Vite actions */ From 157357e1fb6ff2c14a717230cc485fb76a3fea03 Mon Sep 17 00:00:00 2001 From: Raul Melo Date: Mon, 8 May 2023 15:01:23 +0200 Subject: [PATCH 2/3] fix middleware typing export (#7032) * fix middleware typing export * Update .changeset/new-seals-hear.md --------- Co-authored-by: Bjorn Lu --- .changeset/new-seals-hear.md | 5 +++++ packages/astro/package.json | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 .changeset/new-seals-hear.md diff --git a/.changeset/new-seals-hear.md b/.changeset/new-seals-hear.md new file mode 100644 index 000000000000..5308688e73c2 --- /dev/null +++ b/.changeset/new-seals-hear.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +fix middleware typing export for "moduleResolution: node" diff --git a/packages/astro/package.json b/packages/astro/package.json index 50f8c1a46b38..8e8dc5147dba 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -20,6 +20,9 @@ ], "app/*": [ "./dist/core/app/*" + ], + "middleware": [ + "./dist/core/middleware/index.d.ts" ] } }, From e54dcd59437a0532ad391850dbc031f585149b49 Mon Sep 17 00:00:00 2001 From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com> Date: Mon, 8 May 2023 10:17:09 -0700 Subject: [PATCH 3/3] [ci] release (#7037) Co-authored-by: github-actions[bot] --- .changeset/green-chefs-build.md | 5 ----- .changeset/new-seals-hear.md | 5 ----- packages/astro/CHANGELOG.md | 8 ++++++++ packages/astro/package.json | 2 +- packages/integrations/cloudflare/package.json | 2 +- packages/integrations/deno/package.json | 2 +- packages/integrations/image/package.json | 2 +- packages/integrations/markdoc/package.json | 2 +- packages/integrations/netlify/package.json | 2 +- packages/integrations/node/package.json | 2 +- packages/integrations/svelte/package.json | 2 +- packages/integrations/tailwind/package.json | 2 +- packages/integrations/vercel/package.json | 2 +- packages/integrations/vue/package.json | 2 +- 14 files changed, 19 insertions(+), 21 deletions(-) delete mode 100644 .changeset/green-chefs-build.md delete mode 100644 .changeset/new-seals-hear.md diff --git a/.changeset/green-chefs-build.md b/.changeset/green-chefs-build.md deleted file mode 100644 index d1669c826643..000000000000 --- a/.changeset/green-chefs-build.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fix `astro:assets` SSR error diff --git a/.changeset/new-seals-hear.md b/.changeset/new-seals-hear.md deleted file mode 100644 index 5308688e73c2..000000000000 --- a/.changeset/new-seals-hear.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -fix middleware typing export for "moduleResolution: node" diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 8937f31bb721..420f4a2570a9 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,13 @@ # astro +## 2.4.3 + +### Patch Changes + +- [#7034](https://github.com/withastro/astro/pull/7034) [`c00997033`](https://github.com/withastro/astro/commit/c0099703338cf81e2b381e6e754c73b442db4eab) Thanks [@bluwy](https://github.com/bluwy)! - Fix `astro:assets` SSR error + +- [#7032](https://github.com/withastro/astro/pull/7032) [`157357e1f`](https://github.com/withastro/astro/commit/157357e1fb6ff2c14a717230cc485fb76a3fea03) Thanks [@raulfdm](https://github.com/raulfdm)! - fix middleware typing export for "moduleResolution: node" + ## 2.4.2 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 8e8dc5147dba..473a5266ee2a 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "2.4.2", + "version": "2.4.3", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index a5018bac0b8c..d08d21e09e0e 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -38,7 +38,7 @@ "tiny-glob": "^0.2.9" }, "peerDependencies": { - "astro": "workspace:^2.4.2" + "astro": "workspace:^2.4.3" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json index 0db9a1396e8d..e55ddc94e3ba 100644 --- a/packages/integrations/deno/package.json +++ b/packages/integrations/deno/package.json @@ -33,7 +33,7 @@ "esbuild": "^0.15.18" }, "peerDependencies": { - "astro": "workspace:^2.4.2" + "astro": "workspace:^2.4.3" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json index bc1038ac68b2..fbe96ec14809 100644 --- a/packages/integrations/image/package.json +++ b/packages/integrations/image/package.json @@ -62,7 +62,7 @@ "vite": "^4.3.1" }, "peerDependencies": { - "astro": "workspace:^2.4.2", + "astro": "workspace:^2.4.3", "sharp": ">=0.31.0" }, "peerDependenciesMeta": { diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json index cfc28df775d3..1838f149acd4 100644 --- a/packages/integrations/markdoc/package.json +++ b/packages/integrations/markdoc/package.json @@ -41,7 +41,7 @@ "zod": "^3.17.3" }, "peerDependencies": { - "astro": "workspace:^2.4.2" + "astro": "workspace:^2.4.3" }, "devDependencies": { "@types/chai": "^4.3.1", diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index b1483b92bd97..b2cf179883ca 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -39,7 +39,7 @@ "esbuild": "^0.15.18" }, "peerDependencies": { - "astro": "workspace:^2.4.2" + "astro": "workspace:^2.4.3" }, "devDependencies": { "@netlify/edge-functions": "^2.0.0", diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index 8de0d7a1dc14..0a08c38ae6e1 100644 --- a/packages/integrations/node/package.json +++ b/packages/integrations/node/package.json @@ -35,7 +35,7 @@ "server-destroy": "^1.0.1" }, "peerDependencies": { - "astro": "workspace:^2.4.2" + "astro": "workspace:^2.4.3" }, "devDependencies": { "@types/send": "^0.17.1", diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index 850321549331..f1a2bea4a3f4 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -43,7 +43,7 @@ "vite": "^4.3.1" }, "peerDependencies": { - "astro": "workspace:^2.4.2", + "astro": "workspace:^2.4.3", "svelte": "^3.54.0" }, "engines": { diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json index 98fbfad7ade7..3c0c76012ac4 100644 --- a/packages/integrations/tailwind/package.json +++ b/packages/integrations/tailwind/package.json @@ -40,7 +40,7 @@ "vite": "^4.3.1" }, "peerDependencies": { - "astro": "workspace:^2.4.2", + "astro": "workspace:^2.4.3", "tailwindcss": "^3.0.24" }, "pnpm": { diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index 81eb008cd353..9a5511fa75ea 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -55,7 +55,7 @@ "web-vitals": "^3.1.1" }, "peerDependencies": { - "astro": "workspace:^2.4.2" + "astro": "workspace:^2.4.3" }, "devDependencies": { "@types/set-cookie-parser": "^2.4.2", diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index de5e5efcd479..bc357b50b6e3 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -50,7 +50,7 @@ "vue": "^3.2.37" }, "peerDependencies": { - "astro": "workspace:^2.4.2", + "astro": "workspace:^2.4.3", "vue": "^3.2.30" }, "engines": {