Merge branch 'main' into fragments

withastro · Oct 26, 2023 · 5a8d9fa · 5a8d9fa
2 parents 32120b1 + ec7f531
commit 5a8d9fa
Show file tree

Hide file tree

Showing 169 changed files with 5,639 additions and 3,235 deletions.
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://unpkg.com/@changesets/config@1.7.0/schema.json",
+  "$schema": "https://unpkg.com/@changesets/config@2.3.1/schema.json",
   "changelog": ["@changesets/changelog-github", { "repo": "withastro/astro" }],
   "commit": false,
   "linked": [],

diff --git a/.changeset/funny-deers-report.md b/.changeset/funny-deers-report.md
diff --git a/.changeset/good-mirrors-bake.md b/.changeset/good-mirrors-bake.md
@@ -0,0 +1,9 @@
+---
+'astro': minor
+---
+
+Improved image optimization performance
+
+Astro will now generate optimized images concurrently at build time, which can significantly speed up build times for sites with many images. Additionally, Astro will now reuse the same buffer for all variants of an image. This should improve performance for websites with many variants of the same image, especially when using remote images.
+
+No code changes are required to take advantage of these improvements.
diff --git a/.changeset/heavy-lies-cover.md b/.changeset/heavy-lies-cover.md
diff --git a/.changeset/large-stingrays-fry.md b/.changeset/large-stingrays-fry.md
@@ -0,0 +1,21 @@
+---
+'astro': minor
+---
+
+
+Dev Overlay (experimental)
+
+Provides a new dev overlay for your browser preview that allows you to inspect your page islands, see helpful audits on performance and accessibility, and more. A Dev Overlay Plugin API is also included to allow you to add new features and third-party integrations to it.
+
+You can enable access to the dev overlay and its API by adding the following flag to your Astro config:
+
+```ts
+// astro.config.mjs
+export default {
+  experimental: {
+    devOverlay: true
+  }
+};
+```
+
+Read the [Dev Overlay Plugin API documentation](https://docs.astro.build/en/reference/dev-overlay-plugin-reference/) for information about building your own plugins to integrate with Astro's dev overlay.
diff --git a/.changeset/witty-waves-rhyme.md b/.changeset/witty-waves-rhyme.md
@@ -0,0 +1,5 @@
+---
+'astro': minor
+---
+
+Moves the logic for overriding the image service out of core and into adapters. Also fixes a regression where a valid `astro:assets` image service configuration could be overridden.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -1,5 +1,7 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const { builtinModules } = require('module');
 
+/** @type {import("@types/eslint").Linter.Config} */
 module.exports = {
   extends: [
     'plugin:@typescript-eslint/recommended-type-checked',
@@ -16,8 +18,13 @@ module.exports = {
     // These off/configured-differently-by-default rules fit well for us
     '@typescript-eslint/array-type': ['error', { default: 'array-simple' }],
     '@typescript-eslint/no-unused-vars': [
-      'error',
-      { argsIgnorePattern: '^_', ignoreRestSiblings: true },
+      'warn',
+      {
+        argsIgnorePattern: '^_',
+        varsIgnorePattern: '^_',
+        caughtErrorsIgnorePattern: '^_',
+        ignoreRestSiblings: true,
+      },
     ],
     'no-only-tests/no-only-tests': 'error',
     '@typescript-eslint/no-shadow': ['error'],
@@ -69,6 +76,12 @@ module.exports = {
         ],
       },
     },
+    {
+      files: ['packages/astro/src/runtime/client/**/*.ts'],
+      env: {
+        browser: true,
+      },
+    },
     {
       files: ['packages/**/test/*.js', 'packages/**/*.js'],
       env: {

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -35,3 +35,9 @@
 
 'pkg: vue':
 - packages/integrations/vue/**
+
+'docs pr':
+- README.md
+- packages/astro/src/@types/astro.ts
+- packages/astro/src/core/errors/errors-data.ts
+- .changeset/*.md
diff --git a/.github/scripts/bundle-size.mjs b/.github/scripts/bundle-size.mjs
@@ -68,6 +68,7 @@ async function bundle(files) {
 		sourcemap: false,
 		target: ['es2018'],
 		outdir: 'out',
+		external: ['astro:*'],
 		metafile: true,
 	})
 

diff --git a/.github/workflows/snapshot-release.yml b/.github/workflows/snapshot-release.yml
@@ -12,12 +12,12 @@ defaults:
 env:
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
   TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
-  FORCE_COLOR: true
+  FORCE_COLOR: 1
 
 jobs:
   snapshot-release:
     name: Create a snapshot release of a pull request
-    if: ${{ github.repository_owner == 'withastro' && github.event.issue.pull_request && startsWith(github.event.comment.body, '!preview') }}
+    if: ${{ github.repository_owner == 'withastro' && github.event.issue.pull_request && (contains(github.event.comment.body, '!preview') || contains(github.event.comment.body, '/preview') || contains(github.event.comment.body, '!snapshot') || contains(github.event.comment.body, '/snapshot')) }}
     runs-on: ubuntu-latest
     permissions: 
       contents: read 
@@ -37,14 +37,19 @@ jobs:
         uses: actions/github-script@v6
         with:
           script: |
-            const splitComment = context.payload.comment.body.split(' ');
-            splitComment.length !== 2 && (github.rest.issues.createComment({
+            const { body } = context.payload.comment;
+            const PREVIEW_RE = /^[!\/](?:preview|snapshot)\s+(\S*)\s*$/gim;
+            const [_, name] = PREVIEW_RE.exec(body) ?? [];
+            if (name) return name;
+
+            const error = 'Invalid command. Expected: "/preview <snapshot-name>"'
+            github.rest.issues.createComment({
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: 'Invalid comment format. Expected: "!preview <one-word-snapshot-name>"',
-            }) || core.setFailed('Invalid comment format. Expected: "!preview <one-word-snapshot-name>"'));
-            return splitComment[1].trim();
+              body: error,
+            })
+            core.setFailed(error)
           result-encoding: string
 
       - name: resolve pr refs
@@ -56,6 +61,9 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ steps.refs.outputs.head_ref }}
+          fetch-depth: 0
+
+      - run: git fetch origin main:main
 
       - name: Setup PNPM
         uses: pnpm/action-setup@v2
@@ -76,34 +84,78 @@ jobs:
       - name: Bump Package Versions
         id: changesets
         run: |
-          pnpm exec changeset version --snapshot ${{ steps.getSnapshotName.outputs.result }} > changesets.output.txt 2>&1
-          echo ::set-output name=result::`cat changesets.output.txt`
+          pnpm exec changeset status --output status.output.json 2>&1
+          pnpm exec changeset version --snapshot ${{ steps.getSnapshotName.outputs.result }}
+
+          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+          echo "status<<$EOF" >> $GITHUB_OUTPUT
+          echo "$(cat status.output.json)" >> $GITHUB_OUTPUT
+          echo "$EOF" >> $GITHUB_OUTPUT
         env:
           # Needs access to run the script
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # Disable color
+          FORCE_COLOR: 0
+          NO_COLOR: 1
 
       - name: Publish Release
         id: publish
         run: |
-          pnpm run release --tag next--${{ steps.getSnapshotName.outputs.result }} > publish.output.txt 2>&1
-          echo "Release complete"
+          GITHUB_ACTIONS=0 pnpm run build > build.output.txt 2>&1
+          pnpm exec changeset publish --tag experimental--${{ steps.getSnapshotName.outputs.result }} > publish.output.txt 2>&1
+
+          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+
+          echo "build<<$EOF" >> $GITHUB_OUTPUT
+          echo "$(cat build.output.txt)" >> $GITHUB_OUTPUT
+          echo "$EOF" >> $GITHUB_OUTPUT
+          cat build.output.txt
+
+          echo "publish<<$EOF" >> $GITHUB_OUTPUT
+          echo "$(cat publish.output.txt)" >> $GITHUB_OUTPUT
+          echo "$EOF" >> $GITHUB_OUTPUT
           cat publish.output.txt
-          echo ::set-output name=result::`cat publish.output.txt`
         env:
           # Needs access to publish to npm
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          # Disable color
+          FORCE_COLOR: 0
+          NO_COLOR: 1
 
       - name: Pull Request Notification
         uses: actions/github-script@v6
         env:
-          MESSAGE: ${{ steps.publish.outputs.result }}
+          TAG: ${{ steps.getSnapshotName.outputs.result }}
+          STATUS_DATA: ${{ steps.changesets.outputs.status }}
+          BUILD_LOG: ${{ steps.publish.outputs.build }}
+          PUBLISH_LOG: ${{ steps.publish.outputs.publish }}
         with:
           script: |
-            console.log(process.env.MESSAGE);
+            let changeset = { releases: [] };
+            try {
+              changeset = JSON.parse(process.env.STATUS_DATA);
+            } catch (e) {}
+            let message = 'Snapshots have been released for the following packages:'
+            for (const release of changeset.releases) {
+              if (release.type === 'none') continue;
+              message += `\n- \`${release.name}@experimental--${process.env.TAG}\``;
+            }
+
+            function details(title, body) {
+              message += '\n';
+              message += `<details><summary><strong>${title}</strong></summary>`
+              message += '\n\n```\n';
+              message += body;
+              message += '\n```\n\n</details>';
+            }
+
+            details('Publish Log', process.env.PUBLISH_LOG);
+            details('Build Log', process.env.BUILD_LOG);
+
             github.rest.issues.createComment({
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: '```\n' + process.env.MESSAGE + '\n```',
+              body: message,
             })
diff --git a/README.md b/README.md
@@ -42,25 +42,25 @@ Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll
 
 ## Directory
 
-| Package                                                 | Release Notes                                                                                                                     |
-| ------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
-| [astro](packages/astro)                                 | [![astro version](https://img.shields.io/npm/v/astro.svg?label=%20)](packages/astro/CHANGELOG.md)                                 |
-| [create-astro](packages/create-astro)                   | [![create-astro version](https://img.shields.io/npm/v/create-astro.svg?label=%20)](packages/create-astro/CHANGELOG.md)            |
-| [@astrojs/react](packages/integrations/react)           | [![astro version](https://img.shields.io/npm/v/@astrojs/react.svg?label=%20)](packages/integrations/react/CHANGELOG.md)           |
-| [@astrojs/preact](packages/integrations/preact)         | [![astro version](https://img.shields.io/npm/v/@astrojs/preact.svg?label=%20)](packages/integrations/preact/CHANGELOG.md)         |
-| [@astrojs/solid-js](packages/integrations/solid)        | [![astro version](https://img.shields.io/npm/v/@astrojs/solid-js.svg?label=%20)](packages/integrations/solid/CHANGELOG.md)        |
-| [@astrojs/svelte](packages/integrations/svelte)         | [![astro version](https://img.shields.io/npm/v/@astrojs/svelte.svg?label=%20)](packages/integrations/svelte/CHANGELOG.md)         |
-| [@astrojs/vue](packages/integrations/vue)               | [![astro version](https://img.shields.io/npm/v/@astrojs/vue.svg?label=%20)](packages/integrations/vue/CHANGELOG.md)               |
-| [@astrojs/lit](packages/integrations/lit)               | [![astro version](https://img.shields.io/npm/v/@astrojs/lit.svg?label=%20)](packages/integrations/lit/CHANGELOG.md)               |
-| [@astrojs/node](packages/integrations/node)             | [![astro version](https://img.shields.io/npm/v/@astrojs/node.svg?label=%20)](packages/integrations/node/CHANGELOG.md)             |
-| [@astrojs/vercel](packages/integrations/vercel)         | [![astro version](https://img.shields.io/npm/v/@astrojs/vercel.svg?label=%20)](packages/integrations/vercel/CHANGELOG.md)         |
-| [@astrojs/cloudflare](packages/integrations/cloudflare) | [![astro version](https://img.shields.io/npm/v/@astrojs/cloudflare.svg?label=%20)](packages/integrations/cloudflare/CHANGELOG.md) |
-| [@astrojs/partytown](packages/integrations/partytown)   | [![astro version](https://img.shields.io/npm/v/@astrojs/partytown.svg?label=%20)](packages/integrations/partytown/CHANGELOG.md)   |
-| [@astrojs/sitemap](packages/integrations/sitemap)       | [![astro version](https://img.shields.io/npm/v/@astrojs/sitemap.svg?label=%20)](packages/integrations/sitemap/CHANGELOG.md)       |
-| [@astrojs/tailwind](packages/integrations/tailwind)     | [![astro version](https://img.shields.io/npm/v/@astrojs/tailwind.svg?label=%20)](packages/integrations/tailwind/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/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)     |
+| Package                                                                                    | Release Notes                                                                                                                                                        |
+| ------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [astro](packages/astro)                                                                    | [![astro version](https://img.shields.io/npm/v/astro.svg?label=%20)](packages/astro/CHANGELOG.md)                                                                    |
+| [create-astro](packages/create-astro)                                                      | [![create-astro version](https://img.shields.io/npm/v/create-astro.svg?label=%20)](packages/create-astro/CHANGELOG.md)                                               |
+| [@astrojs/react](packages/integrations/react)                                              | [![astro version](https://img.shields.io/npm/v/@astrojs/react.svg?label=%20)](packages/integrations/react/CHANGELOG.md)                                              |
+| [@astrojs/preact](packages/integrations/preact)                                            | [![astro version](https://img.shields.io/npm/v/@astrojs/preact.svg?label=%20)](packages/integrations/preact/CHANGELOG.md)                                            |
+| [@astrojs/solid-js](packages/integrations/solid)                                           | [![astro version](https://img.shields.io/npm/v/@astrojs/solid-js.svg?label=%20)](packages/integrations/solid/CHANGELOG.md)                                           |
+| [@astrojs/svelte](packages/integrations/svelte)                                            | [![astro version](https://img.shields.io/npm/v/@astrojs/svelte.svg?label=%20)](packages/integrations/svelte/CHANGELOG.md)                                            |
+| [@astrojs/vue](packages/integrations/vue)                                                  | [![astro version](https://img.shields.io/npm/v/@astrojs/vue.svg?label=%20)](packages/integrations/vue/CHANGELOG.md)                                                  |
+| [@astrojs/lit](packages/integrations/lit)                                                  | [![astro version](https://img.shields.io/npm/v/@astrojs/lit.svg?label=%20)](packages/integrations/lit/CHANGELOG.md)                                                  |
+| [@astrojs/node](packages/integrations/node)                                                | [![astro version](https://img.shields.io/npm/v/@astrojs/node.svg?label=%20)](packages/integrations/node/CHANGELOG.md)                                                |
+| [@astrojs/vercel](packages/integrations/vercel)                                            | [![astro version](https://img.shields.io/npm/v/@astrojs/vercel.svg?label=%20)](packages/integrations/vercel/CHANGELOG.md)                                            |
+| [@astrojs/cloudflare](https://github.com/withastro/adapters/blob/main/packages/cloudflare) | [![astro version](https://img.shields.io/npm/v/@astrojs/cloudflare.svg?label=%20)](https://github.com/withastro/adapters/blob/main/packages/cloudflare/CHANGELOG.md) |
+| [@astrojs/partytown](packages/integrations/partytown)                                      | [![astro version](https://img.shields.io/npm/v/@astrojs/partytown.svg?label=%20)](packages/integrations/partytown/CHANGELOG.md)                                      |
+| [@astrojs/sitemap](packages/integrations/sitemap)                                          | [![astro version](https://img.shields.io/npm/v/@astrojs/sitemap.svg?label=%20)](packages/integrations/sitemap/CHANGELOG.md)                                          |
+| [@astrojs/tailwind](packages/integrations/tailwind)                                        | [![astro version](https://img.shields.io/npm/v/@astrojs/tailwind.svg?label=%20)](packages/integrations/tailwind/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/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)                                        |
 
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/6178/badge)](https://bestpractices.coreinfrastructure.org/projects/6178)
 

diff --git a/benchmark/packages/timer/package.json b/benchmark/packages/timer/package.json
@@ -26,7 +26,7 @@
     "server-destroy": "^1.0.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.2"
+    "astro": "workspace:*"
   },
   "devDependencies": {
     "@types/server-destroy": "^1.0.1",

diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.3.1"
+    "astro": "^3.3.4"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^1.1.2",
+    "@astrojs/mdx": "^1.1.3",
     "@astrojs/rss": "^3.0.0",
-    "@astrojs/sitemap": "^3.0.1",
-    "astro": "^3.3.1"
+    "@astrojs/sitemap": "^3.0.2",
+    "astro": "^3.3.4"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
@@ -15,9 +15,9 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^3.3.1"
+    "astro": "^3.3.4"
   },
   "peerDependencies": {
-    "astro": "^2.0.0-beta.0"
+    "astro": "^3.0.0"
   }
 }
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.1",
     "@types/alpinejs": "^3.7.2",
     "alpinejs": "^3.12.3",
-    "astro": "^3.3.1"
+    "astro": "^3.3.4"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^3.0.2",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^3.3.1",
+    "astro": "^3.3.4",
     "lit": "^2.8.0"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
@@ -12,11 +12,11 @@
   },
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
-    "@astrojs/react": "^3.0.3",
+    "@astrojs/react": "^3.0.4",
     "@astrojs/solid-js": "^3.0.2",
     "@astrojs/svelte": "^4.0.3",
-    "@astrojs/vue": "^3.0.1",
-    "astro": "^3.3.1",
+    "@astrojs/vue": "^3.0.2",
+    "astro": "^3.3.4",
     "preact": "^10.17.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@preact/signals": "^1.2.1",
-    "astro": "^3.3.1",
+    "astro": "^3.3.4",
     "preact": "^10.17.1"
   }
 }