Merge branch 'next' into feat/remove-astro-image

Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>

.changeset/afraid-dots-whisper.md

@@ -0,0 +1,30 @@
+---
+'@astrojs/cloudflare': major
+'@astrojs/partytown': major
+'@astrojs/tailwind': major
+'@astrojs/netlify': major
+'@astrojs/sitemap': major
+'@astrojs/preact': major
+'@astrojs/svelte': major
+'@astrojs/vercel': major
+'@astrojs/react': major
+'@astrojs/solid-js': major
+'@astrojs/deno': major
+'@astrojs/node': major
+'@astrojs/lit': major
+'@astrojs/vue': major
+'create-astro': major
+'@astrojs/prism': major
+'@astrojs/rss': major
+'@astrojs/telemetry': major
+'astro': major
+'@astrojs/turbolinks': minor
+'@astrojs/alpinejs': minor
+'@astrojs/prefetch': minor
+'@astrojs/markdoc': minor
+'@astrojs/underscore-redirects': minor
+'@astrojs/mdx': minor
+'@astrojs/internal-helpers': minor
+---
+
+Remove support for Node 16. The lowest supported version by Astro and all integrations is now v18.14.1. As a reminder, Node 16 will be deprecated on the 11th September 2023.

.changeset/chilled-ducks-grin.md

@@ -0,0 +1,5 @@
+---
+'astro': major
+---
+
+Removed automatic flattening of `getStaticPaths` result. `.flatMap` and `.flat` should now be used to ensure that you're returning a flat array.

.changeset/dirty-lies-cover.md

@@ -0,0 +1,32 @@
+---
+'@astrojs/cloudflare': minor
+'@astrojs/netlify': minor
+'@astrojs/vercel': minor
+'@astrojs/deno': minor
+'@astrojs/node': minor
+'astro': minor
+---
+
+Introduced the concept of feature map. A feature map is a list of features that are built-in in Astro, and an Adapter
+can tell Astro if it can support it.
+
+```ts
+import {AstroIntegration} from "./astro";
+
+function myIntegration(): AstroIntegration {
+    return {
+        name: 'astro-awesome-list',
+        // new feature map
+        supportedAstroFeatures: {
+            hybridOutput: 'experimental',
+            staticOutput: 'stable',
+            serverOutput: 'stable',
+            assets: {
+                supportKind: 'stable',
+                isSharpCompatible: false,
+                isSquooshCompatible: false,
+            },
+        }
+    }
+}
+```

.changeset/fair-emus-divide.md

@@ -0,0 +1,39 @@
+---
+'astro': major
+'@astrojs/netlify': minor
+---
+
+The `build.split` and `build.excludeMiddleware` configuration options are deprecated and have been replaced by options in the adapter config.
+
+If your config includes the `build.excludeMiddleware` option, replace it with `edgeMiddleware` in your adapter options:
+
+```diff
+import { defineConfig } from "astro/config";
+import netlify from "@astrojs/netlify/functions";
+
+export default defineConfig({
+     build: {
+-        excludeMiddleware: true
+     },
+     adapter: netlify({
++        edgeMiddleware: true
+     }),
+});
+```
+
+If your config includes the `build.split` option, replace it with `functionPerRoute` in your adapter options:
+
+```diff
+import { defineConfig } from "astro/config";
+import netlify from "@astrojs/netlify/functions";
+
+export default defineConfig({
+     build: {
+-        split: true
+     },
+     adapter: netlify({
++        functionPerRoute: true
+     }),
+});
+```
+

.changeset/famous-queens-itch.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/mdx': patch
+---
+
+Re-orders the MDX plugin to run before Astro's JSX plugin

.changeset/four-houses-compete.md

@@ -0,0 +1,18 @@
+---
+'astro': major
+---
+
+Sharp is now the default image service used for `astro:assets`. If you would prefer to still use Squoosh, you can update your config with the following:
+
+```ts
+import { defineConfig, squooshImageService } from "astro/config";
+
+// https://astro.build/config
+export default defineConfig({
+  image: {
+    service: squooshImageService(),
+  }
+})
+```
+
+However, not only do we recommend using Sharp as it is faster and more reliable, it is also highly likely that the Squoosh service will be removed in a future release.

.changeset/heavy-walls-arrive.md

@@ -0,0 +1,8 @@
+---
+'@astrojs/cloudflare': major
+'@astrojs/netlify': major
+'@astrojs/vercel': major
+'astro': major
+---
+
+When using an adapter that supports neither Squoosh or Sharp, Astro will now automatically use an image service that does not support processing, but still provides the other benefits of `astro:assets` such as enforcing `alt`, no CLS etc to users

.changeset/loud-candles-admire.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/mdx': patch
+---
+
+Handle `components` exports handling itself

.changeset/mighty-dancers-lay.md

@@ -0,0 +1,5 @@
+---
+'astro': major
+---
+
+Removed support for old syntax of the API routes.

.changeset/odd-books-live.md

@@ -0,0 +1,23 @@
+---
+'astro': minor
+---
+
+Integrations can now log messages using Astro’s built-in logger.
+
+The logger is available to all hooks as an additional parameter:
+
+```ts
+import {AstroIntegration} from "./astro";
+
+// integration.js
+export function myIntegration(): AstroIntegration {
+    return {
+        name: "my-integration",
+        hooks: {
+            "astro:config:done": ({ logger }) => {
+                logger.info("Configure integration...");
+            }
+        }
+    }
+}
+```

.changeset/pre.json

@@ -0,0 +1,35 @@
+{
+  "mode": "pre",
+  "tag": "beta",
+  "initialVersions": {
+    "astro": "2.9.6",
+    "@astrojs/prism": "2.1.2",
+    "@astrojs/rss": "2.4.3",
+    "create-astro": "3.1.10",
+    "@astrojs/alpinejs": "0.2.2",
+    "@astrojs/cloudflare": "6.6.2",
+    "@astrojs/deno": "4.3.0",
+    "@astrojs/lit": "2.1.0",
+    "@astrojs/markdoc": "0.4.4",
+    "@astrojs/mdx": "0.19.7",
+    "@astrojs/netlify": "2.5.1",
+    "@astrojs/node": "5.3.0",
+    "@astrojs/partytown": "1.2.3",
+    "@astrojs/preact": "2.2.1",
+    "@astrojs/prefetch": "0.3.0",
+    "@astrojs/react": "2.2.1",
+    "@astrojs/sitemap": "2.0.1",
+    "@astrojs/solid-js": "2.2.0",
+    "@astrojs/svelte": "3.1.0",
+    "@astrojs/tailwind": "4.0.0",
+    "@astrojs/turbolinks": "0.2.2",
+    "@astrojs/vercel": "3.7.4",
+    "@astrojs/vue": "2.2.1",
+    "@astrojs/internal-helpers": "0.1.1",
+    "@astrojs/markdown-component": "1.0.5",
+    "@astrojs/markdown-remark": "2.2.1",
+    "@astrojs/telemetry": "2.1.1",
+    "@astrojs/underscore-redirects": "0.2.0"
+  },
+  "changesets": []
+}

.changeset/rude-ears-play.md

@@ -0,0 +1,5 @@
+---
+'astro': major
+---
+
+Remove MDX plugin re-ordering hack

.changeset/spicy-eels-rush.md

@@ -0,0 +1,8 @@
+---
+'astro': major
+'@astrojs/netlify': major
+'@astrojs/vercel': major
+'@astrojs/node': major
+---
+
+Reduced the amount of polyfills provided by Astro. Astro will no longer provide (no-op) polyfills for several web apis such as HTMLElement, Image or Document. If you need access to those APIs on the server, we recommend using more proper polyfills available on npm.

.changeset/three-adults-exist.md

@@ -0,0 +1,5 @@
+---
+'astro': major
+---
+
+Update `tsconfig.json` presets with `moduleResolution: 'bundler'` and other new options from TypeScript 5.0. Astro now assumes that you use TypeScript 5.0 (March 2023), or that your editor includes it, ex: VS Code 1.77

.changeset/three-onions-repeat.md

@@ -0,0 +1,5 @@
+---
+'astro': major
+---
+
+The `astro check` command now requires an external package `@astrojs/check` and an install of `typescript` in your project. This was done in order to make the main `astro` package smaller and give more flexibility to users in regard to the version of TypeScript they use.

.changeset/tricky-candles-suffer.md

@@ -0,0 +1,39 @@
+---
+'astro': major
+'@astrojs/vercel': minor
+---
+
+The `build.split` and `build.excludeMiddleware` configuration options are deprecated and have been replaced by options in the adapter config.
+
+If your config includes the `build.excludeMiddleware` option, replace it with `edgeMiddleware` in your adapter options:
+
+```diff
+import { defineConfig } from "astro/config";
+import vercel from "@astrojs/vercel/serverless";
+
+export default defineConfig({
+     build: {
+-        excludeMiddleware: true
+     },
+     adapter: vercel({
++        edgeMiddleware: true
+     }),
+});
+```
+
+If your config includes the `build.split` option, replace it with `functionPerRoute` in your adapter options:
+
+```diff
+import { defineConfig } from "astro/config";
+import vercel from "@astrojs/vercel/serverless";
+
+export default defineConfig({
+     build: {
+-        split: true
+     },
+     adapter: vercel({
++        functionPerRoute: true
+     }),
+});
+```
+

.changeset/twelve-coats-rush.md

@@ -0,0 +1,35 @@
+---
+'astro': major
+---
+
+Lowercase names for endpoint functions are now deprecated.
+
+Rename functions to their uppercase equivalent:
+
+```diff
+- export function get() {
++ export function GET() {
+    return new Response(JSON.stringify({ "title": "Bob's blog" }));
+}
+
+- export function post() {
++ export function POST() {
+    return new Response(JSON.stringify({ "title": "Bob's blog" }));
+}
+
+- export function put() {
++ export function PUT() {
+    return new Response(JSON.stringify({ "title": "Bob's blog" }));
+}
+
+- export function all() {
++ export function ALL() {
+    return new Response(JSON.stringify({ "title": "Bob's blog" }));
+}
+
+// you can use the whole word "DELETE"
+- export function del() {
++ export function DELETE() {
+    return new Response(JSON.stringify({ "title": "Bob's blog" }));
+}
+```

.changeset/twenty-cheetahs-deny.md

@@ -0,0 +1,17 @@
+---
+'astro': major
+---
+
+Astro.cookies.get(key) returns undefined if cookie doesn't exist
+
+With this change, Astro.cookies.get(key) no longer always returns a `AstroCookie` object. Instead it now returns `undefined` if the cookie does not exist.
+
+You should update your code if you assume that all calls to `get()` return a value. When using with `has()` you still need to assert the value, like so:
+
+```astro
+---
+if(Astro.cookies.has(id)) {
+  const id = Astro.cookies.get(id)!;
+}
+---
+```

.changeset/unlucky-hotels-try.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/mdx': minor
+---
+
+Add `astro` as peer dependency

.changeset/unlucky-sheep-build.md

@@ -0,0 +1,7 @@
+---
+'astro': major
+---
+
+Astro's default port when running the dev or preview server is now `4321`.
+
+This will reduce conflicts with ports used by other tools.

.changeset/young-roses-teach.md

@@ -0,0 +1,5 @@
+---
+'astro': major
+---
+
+Remove MDX special `components` export handling

.devcontainer/basics/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/basics",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/blog/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/blog",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/deno/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/deno",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/docs/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/docs",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/framework-alpine/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/framework-alpine",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/framework-lit/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/framework-lit",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/framework-multiple/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/framework-multiple",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/framework-preact/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/framework-preact",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/framework-react/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/framework-react",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/framework-solid/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/framework-solid",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/framework-svelte/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/framework-svelte",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/framework-vue/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/framework-vue",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/hackernews/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/hackernews",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/minimal/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/minimal",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/non-html-pages/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/non-html-pages",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/portfolio/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/portfolio",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/ssr/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/ssr",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/with-markdown-plugins/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/with-markdown-plugins",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/with-markdown-shiki/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/with-markdown-shiki",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/with-mdx/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/with-mdx",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/with-nanostores/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/with-nanostores",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/with-tailwindcss/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/with-tailwindcss",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/with-vite-plugin-pwa/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/with-vite-plugin-pwa",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.devcontainer/with-vitest/devcontainer.json

@@ -7,13 +7,13 @@
   "workspaceFolder": "/workspaces/astro/examples/with-vitest",
 
   "portsAttributes": {
-    "3000": {
+    "4321": {
       "label": "Application",
       "onAutoForward": "openPreview"
     }
   },
 
-  "forwardPorts": [3000],
+  "forwardPorts": [4321],
 
   "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
 

.eslintignore

@@ -2,7 +2,6 @@
 packages/**/*.min.js
 packages/**/dist/**/*
 packages/**/fixtures/**/*
-packages/webapi/**/*
 packages/astro/vendor/vite/**/*
 examples/**/*
 scripts/**/*

.github/ISSUE_TEMPLATE/---01-bug-report.yml

@@ -10,7 +10,7 @@ body:
         Thank you for taking the time to file a bug report! Please fill out this form as completely as possible.
 
         ✅ I am using the **latest version of Astro** and all plugins.
-        ✅ I am using a version of Node that supports ESM (`v14.18.0+`, or `v16.12.0+`)
+        ✅ I am using a version of Node that Astro supports (`>=18.14.1`)
   - type: input
     id: astro-version
     attributes:

.github/workflows/check.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: "pnpm"
 
       - name: Install dependencies

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
     strategy:
       matrix:
         OS: [ubuntu-latest, windows-latest]
-        NODE_VERSION: [16]
+        NODE_VERSION: [18]
       fail-fast: true
     steps:
       # Disable crlf so all OS can share the same Turbo cache
@@ -85,7 +85,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: "pnpm"
 
       - name: Install dependencies
@@ -108,12 +108,12 @@ jobs:
     strategy:
       matrix:
         OS: [ubuntu-latest]
-        NODE_VERSION: [16, 18]
+        NODE_VERSION: [18, 20]
         include:
           - os: macos-latest
-            NODE_VERSION: 16
+            NODE_VERSION: 18
           - os: windows-latest
-            NODE_VERSION: 16
+            NODE_VERSION: 18
       fail-fast: false
     env:
       NODE_VERSION: ${{ matrix.NODE_VERSION }}
@@ -155,7 +155,7 @@ jobs:
     strategy:
       matrix:
         OS: [ubuntu-latest, windows-latest]
-        NODE_VERSION: [16]
+        NODE_VERSION: [18]
       fail-fast: false
     env:
       NODE_VERSION: ${{ matrix.NODE_VERSION }}
@@ -192,7 +192,7 @@ jobs:
     strategy:
       matrix:
         OS: [ubuntu-latest, windows-latest]
-        NODE_VERSION: [16]
+        NODE_VERSION: [18]
     env:
       NODE_VERSION: ${{ matrix.NODE_VERSION }}
     steps:

.github/workflows/main.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: "pnpm"
 
       - name: Install dependencies

.github/workflows/release.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: "pnpm"
 
       - name: Install dependencies

.github/workflows/scripts.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: "pnpm"
 
       - name: Install dependencies

.github/workflows/snapshot-release.yml

@@ -58,7 +58,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           registry-url: "https://registry.npmjs.org"
           cache: "pnpm"
 

.gitpod.yml

@@ -18,7 +18,7 @@ vscode:
     - esbenp.prettier-vscode
     - dbaeumer.vscode-eslint
 ports:
-  - port: 3000
+  - port: 4321
     onOpen: open-preview
 github:
   prebuilds:

.nvmrc

@@ -1 +1 @@
-16.19.0
+18.14.1

.prettierignore

@@ -22,5 +22,4 @@ benchmark/results/
 .changeset
 
 # Files
-packages/webapi/mod.d.ts
 pnpm-lock.yaml

CONTRIBUTING.md

@@ -10,7 +10,7 @@ We welcome contributions of any size and skill level. As an open source project,
 ### Prerequisites
 
 ```shell
-node: "^>=16.12.0"
+node: "^>=18.14.1"
 pnpm: "^8.6.2"
 # otherwise, your build will fail
 ```

README.md

@@ -62,7 +62,6 @@ Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll
 | [@astrojs/tailwind](packages/integrations/tailwind)     | [![astro version](https://img.shields.io/npm/v/@astrojs/tailwind.svg?label=%20)](packages/integrations/tailwind/CHANGELOG.md)     |
 | [@astrojs/turbolinks](packages/integrations/turbolinks) | [![astro version](https://img.shields.io/npm/v/@astrojs/turbolinks.svg?label=%20)](packages/integrations/turbolinks/CHANGELOG.md) |
 | [@astrojs/alpinejs](packages/integrations/alpinejs)     | [![astro version](https://img.shields.io/npm/v/@astrojs/alpinejs.svg?label=%20)](packages/integrations/alpinejs/CHANGELOG.md)     |
-| [@astrojs/image](packages/integrations/image)           | [![astro version](https://img.shields.io/npm/v/@astrojs/image.svg?label=%20)](packages/integrations/image/CHANGELOG.md)           |
 | [@astrojs/mdx](packages/integrations/mdx)               | [![astro version](https://img.shields.io/npm/v/@astrojs/mdx.svg?label=%20)](packages/integrations/mdx/CHANGELOG.md)               |
 | [@astrojs/prefetch](packages/integrations/prefetch)     | [![astro version](https://img.shields.io/npm/v/@astrojs/prefetch.svg?label=%20)](packages/integrations/prefetch/CHANGELOG.md)     |
 

benchmark/packages/timer/package.json

@@ -23,7 +23,6 @@
     "dev": "astro-scripts dev \"src/**/*.ts\""
   },
   "dependencies": {
-    "@astrojs/webapi": "workspace:*",
     "server-destroy": "^1.0.1"
   },
   "peerDependencies": {

benchmark/packages/timer/src/server.ts

@@ -1,11 +1,8 @@
-import { polyfill } from '@astrojs/webapi';
 import type { SSRManifest } from 'astro';
-import { NodeApp } from 'astro/app/node';
+import { NodeApp, applyPolyfills } from 'astro/app/node';
 import type { IncomingMessage, ServerResponse } from 'node:http';
 
-polyfill(globalThis, {
+applyPolyfills();
-	exclude: 'window document',
-});
 
 export function createExports(manifest: SSRManifest) {
 	const app = new NodeApp(manifest);

benchmark/packages/timer/tsconfig.json

@@ -3,8 +3,8 @@
   "include": ["src"],
   "compilerOptions": {
     "allowJs": true,
-    "module": "ES2020",
+    "module": "ES2022",
     "outDir": "./dist",
-    "target": "ES2020"
+    "target": "ES2022"
   }
 }

examples/basics/README.md

@@ -43,7 +43,7 @@ All commands are run from the root of the project, from a terminal:
 | Command                   | Action                                           |
 | :------------------------ | :----------------------------------------------- |
 | `npm install`             | Installs dependencies                            |
-| `npm run dev`             | Starts local dev server at `localhost:3000`      |
+| `npm run dev`             | Starts local dev server at `localhost:4321`      |
 | `npm run build`           | Build your production site to `./dist/`          |
 | `npm run preview`         | Preview your build locally, before deploying     |
 | `npm run astro ...`       | Run CLI commands like `astro add`, `astro check` |

examples/basics/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/blog/README.md

@@ -53,7 +53,7 @@ All commands are run from the root of the project, from a terminal:
 | Command                   | Action                                           |
 | :------------------------ | :----------------------------------------------- |
 | `npm install`             | Installs dependencies                            |
-| `npm run dev`             | Starts local dev server at `localhost:3000`      |
+| `npm run dev`             | Starts local dev server at `localhost:4321`      |
 | `npm run build`           | Build your production site to `./dist/`          |
 | `npm run preview`         | Preview your build locally, before deploying     |
 | `npm run astro ...`       | Run CLI commands like `astro add`, `astro check` |

examples/blog/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/blog/src/pages/blog/[...slug].astro

@@ -1,5 +1,5 @@
 ---
-import { CollectionEntry, getCollection } from 'astro:content';
+import { type CollectionEntry, getCollection } from 'astro:content';
 import BlogPost from '../../layouts/BlogPost.astro';
 
 export async function getStaticPaths() {

examples/deno/README.md

@@ -42,7 +42,7 @@ All commands are run from the root of the project, from a terminal:
 | Command                   | Action                                           |
 | :------------------------ | :----------------------------------------------- |
 | `npm install`             | Installs dependencies                            |
-| `npm run dev`             | Starts local dev server at `localhost:3000`      |
+| `npm run dev`             | Starts local dev server at `localhost:4321`      |
 | `npm run build`           | Build your production site to `./dist/`          |
 | `npm run preview`         | Preview your build locally, before deploying     |
 |                           | (preview uses Deno CLI)                          |

examples/deno/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/framework-alpine/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/framework-lit/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/framework-multiple/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/framework-preact/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/framework-react/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/framework-solid/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/framework-svelte/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/framework-vue/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/hackernews/README.md

@@ -48,7 +48,7 @@ All commands are run from the root of the project, from a terminal:
 | Command                   | Action                                           |
 | :------------------------ | :----------------------------------------------- |
 | `npm install`             | Installs dependencies                            |
-| `npm run dev`             | Starts local dev server at `localhost:3000`      |
+| `npm run dev`             | Starts local dev server at `localhost:4321`      |
 | `npm run build`           | Build your production site to `./dist/`          |
 | `npm run preview`         | Preview your build locally, before deploying     |
 | `npm run astro ...`       | Run CLI commands like `astro add`, `astro check` |

examples/hackernews/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/minimal/README.md

@@ -36,7 +36,7 @@ All commands are run from the root of the project, from a terminal:
 | Command                   | Action                                           |
 | :------------------------ | :----------------------------------------------- |
 | `npm install`             | Installs dependencies                            |
-| `npm run dev`             | Starts local dev server at `localhost:3000`      |
+| `npm run dev`             | Starts local dev server at `localhost:4321`      |
 | `npm run build`           | Build your production site to `./dist/`          |
 | `npm run preview`         | Preview your build locally, before deploying     |
 | `npm run astro ...`       | Run CLI commands like `astro add`, `astro check` |

examples/minimal/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/non-html-pages/README.md

@@ -41,7 +41,7 @@ All commands are run from the root of the project, from a terminal:
 | Command                   | Action                                           |
 | :------------------------ | :----------------------------------------------- |
 | `npm install`             | Installs dependencies                            |
-| `npm run dev`             | Starts local dev server at `localhost:3000`      |
+| `npm run dev`             | Starts local dev server at `localhost:4321`      |
 | `npm run build`           | Build your production site to `./dist/`          |
 | `npm run preview`         | Preview your build locally, before deploying     |
 | `npm run astro ...`       | Run CLI commands like `astro add`, `astro check` |

examples/non-html-pages/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/portfolio/README.md

@@ -19,7 +19,7 @@ All commands are run from the root of the project, from a terminal:
 | Command                   | Action                                           |
 | :------------------------ | :----------------------------------------------- |
 | `npm install`             | Installs dependencies                            |
-| `npm run dev`             | Starts local dev server at `localhost:3000`      |
+| `npm run dev`             | Starts local dev server at `localhost:4321`      |
 | `npm run build`           | Build your production site to `./dist/`          |
 | `npm run preview`         | Preview your build locally, before deploying     |
 | `npm run astro ...`       | Run CLI commands like `astro add`, `astro check` |

examples/portfolio/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/portfolio/src/pages/work/[...slug].astro

@@ -1,5 +1,5 @@
 ---
-import { CollectionEntry, getCollection } from 'astro:content';
+import { type CollectionEntry, getCollection } from 'astro:content';
 
 import BaseLayout from '../../layouts/BaseLayout.astro';
 

examples/ssr/src/pages/cart.astro

@@ -3,7 +3,7 @@ import Header from '../components/Header.astro';
 import Container from '../components/Container.astro';
 import { getCart } from '../api';
 
-if (!Astro.cookies.get('user-id').value) {
+if (!Astro.cookies.get('user-id')) {
 	return Astro.redirect('/');
 }
 

examples/with-markdoc/README.md

@@ -45,7 +45,7 @@ All commands are run from the root of the project, from a terminal:
 | Command                   | Action                                           |
 | :------------------------ | :----------------------------------------------- |
 | `npm install`             | Installs dependencies                            |
-| `npm run dev`             | Starts local dev server at `localhost:3000`      |
+| `npm run dev`             | Starts local dev server at `localhost:4321`      |
 | `npm run build`           | Build your production site to `./dist/`          |
 | `npm run preview`         | Preview your build locally, before deploying     |
 | `npm run astro ...`       | Run CLI commands like `astro add`, `astro check` |

examples/with-markdoc/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/with-markdown-plugins/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/with-markdown-shiki/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/with-mdx/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/with-nanostores/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/with-tailwindcss/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/with-vite-plugin-pwa/README.md

@@ -36,7 +36,7 @@ All commands are run from the root of the project, from a terminal:
 | Command                   | Action                                           |
 | :------------------------ | :----------------------------------------------- |
 | `npm install`             | Installs dependencies                            |
-| `npm run dev`             | Starts local dev server at `localhost:3000`      |
+| `npm run dev`             | Starts local dev server at `localhost:4321`      |
 | `npm run build`           | Build your production site to `./dist/`          |
 | `npm run preview`         | Preview your build locally, before deploying     |
 | `npm run astro ...`       | Run CLI commands like `astro add`, `astro check` |

examples/with-vite-plugin-pwa/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

examples/with-vitest/sandbox.config.json

@@ -4,7 +4,7 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
     "node": "14"
   }

package.json

@@ -39,7 +39,7 @@
     "packages/*"
   ],
   "engines": {
-    "node": ">=16.12.0",
+    "node": ">=18.14.1",
     "pnpm": ">=8.6.2"
   },
   "packageManager": "pnpm@8.6.2",
@@ -73,7 +73,6 @@
     }
   },
   "dependencies": {
-    "@astrojs/webapi": "workspace:*",
     "astro-benchmark": "workspace:*"
   },
   "devDependencies": {
@@ -82,7 +81,7 @@
     "@types/node": "^18.16.18",
     "@typescript-eslint/eslint-plugin": "6.0.0",
     "@typescript-eslint/parser": "6.0.0",
-    "esbuild": "^0.17.19",
+    "esbuild": "^0.18.16",
     "eslint": "^8.43.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-no-only-tests": "^2.6.0",
@@ -93,6 +92,6 @@
     "prettier-plugin-astro": "^0.10.0",
     "tiny-glob": "^0.2.9",
     "turbo": "^1.10.3",
-    "typescript": "~5.0.2"
+    "typescript": "~5.1.6"
   }
 }

packages/astro-prism/package.json

@@ -14,7 +14,7 @@
   "homepage": "https://docs.astro.build/en/reference/api-reference/#prism-",
   "main": "dist/index.js",
   "scripts": {
-    "build": "astro-scripts build \"src/**/*.ts\" && tsc",
+    "build": "astro-scripts build \"src/**/*.ts\" && tsc -p ./tsconfig.json",
     "build:ci": "astro-scripts build \"src/**/*.ts\"",
     "dev": "astro-scripts dev \"src/**/*.ts\""
   },
@@ -39,6 +39,6 @@
     "astro-scripts": "workspace:*"
   },
   "engines": {
-    "node": ">=16.12.0"
+    "node": ">=18.14.1"
   }
 }

packages/astro-prism/tsconfig.json

@@ -3,7 +3,7 @@
   "include": ["src"],
   "compilerOptions": {
     "allowJs": true,
-    "target": "ES2021",
+    "target": "ES2022",
     "module": "ES2022",
     "outDir": "./dist"
   }

packages/astro-rss/tsconfig.json

@@ -5,7 +5,7 @@
     "allowJs": true,
     "module": "ES2022",
     "outDir": "./dist",
-    "target": "ES2021",
+    "target": "ES2022",
     "strictNullChecks": true
   }
 }