Merge branch 'main' into static-sitemap

withastro · May 8, 2023 · 2049c5d · 2049c5d
2 parents 5001721 + e54dcd5
commit 2049c5d
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 11 deletions.
diff --git 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
@@ -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",
@@ -20,6 +20,9 @@
       ],
       "app/*": [
         "./dist/core/app/*"
+      ],
+      "middleware": [
+        "./dist/core/middleware/index.d.ts"
       ]
     }
   },

diff --git 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 `<Prism/>` 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 */

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -50,7 +50,7 @@
     "vue": "^3.2.37"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.4.2",
+    "astro": "workspace:^2.4.3",
     "vue": "^3.2.30"
   },
   "engines": {