Skip to content

Commit

Permalink
Merge branch 'main' into adapter-enhancements
Browse files Browse the repository at this point in the history
  • Loading branch information
ematipico authored Jan 15, 2024
2 parents b992dd5 + 1bf0ddd commit 7971af9
Show file tree
Hide file tree
Showing 119 changed files with 930 additions and 880 deletions.
5 changes: 0 additions & 5 deletions .changeset/afraid-ligers-add.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/afraid-suits-beam.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@astrojs/partytown": patch
---

Fixes an issue where Partytown scripts didn't execute after view transition
5 changes: 0 additions & 5 deletions .changeset/big-knives-own.md

This file was deleted.

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

Disables internal file watcher for one-off Vite servers to improve start-up performance
5 changes: 0 additions & 5 deletions .changeset/curvy-socks-rhyme.md

This file was deleted.

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

Improves HMR for Astro style and script modules
5 changes: 0 additions & 5 deletions .changeset/honest-seas-raise.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/kind-waves-travel.md

This file was deleted.

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

Fix the passthrough image service not generating `srcset` values properly
5 changes: 5 additions & 0 deletions .changeset/poor-cherries-buy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"astro": patch
---

Disables View Transition form handling when the `action` property points to an external URL
5 changes: 5 additions & 0 deletions .changeset/proud-guests-bake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"astro": patch
---

Adds an error during the build phase in case `i18n.routing.prefixDefaultLocale` is set to `true` and the index page is missing.
5 changes: 0 additions & 5 deletions .changeset/shy-spoons-sort.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/silent-taxis-act.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/stale-pandas-count.md

This file was deleted.

4 changes: 4 additions & 0 deletions .changeset/weak-planes-help.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
"astro": patch
---
Fixes an issue where anchor elements within a custom component could not trigger a view transition.
26 changes: 15 additions & 11 deletions .github/workflows/check-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,26 @@ jobs:
files: |
.changeset/**/*.md
- name: Check if any changesets contain minor changes
id: minor
- name: Check if any changesets contain minor or major changes
id: check
if: steps.blocked.outputs.result != 'true'
run: |
echo "Checking for changesets marked as minor"
echo "Checking for changesets marked as minor or major"
echo "found=false" >> $GITHUB_OUTPUT
regex="[\"']astro[\"']: (minor|major)"
for file in ${{ steps.changed-files.outputs.all_changed_files }}; do
if grep -q "'astro': minor" "$file"; then
echo "found=true" >> $GITHUB_OUTPUT
echo "$file has a minor release tag"
fi
if [[ $(cat $file) =~ $regex ]]; then
version="${BASH_REMATCH[1]}"
echo "version=$version" >> $GITHUB_OUTPUT
echo "found=true" >> $GITHUB_OUTPUT
echo "$file has a $version release tag"
fi
done
- name: Add label
uses: actions/github-script@v6
if: steps.minor.outputs.found == 'true'
if: steps.check.outputs.found == 'true'
env:
issue_number: ${{ github.event.number }}
with:
Expand All @@ -69,12 +73,12 @@ jobs:
issue_number: process.env.issue_number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: ['semver: minor']
labels: ['semver: ${{ steps.check.outputs.version }}']
});
- name: Change PR Status
uses: actions/github-script@v6
if: steps.minor.outputs.found == 'true'
if: steps.check.outputs.found == 'true'
env:
issue_number: ${{ github.event.number }}
with:
Expand All @@ -84,5 +88,5 @@ jobs:
repo: context.repo.repo,
pull_number: process.env.issue_number,
event: 'REQUEST_CHANGES',
body: 'This PR is blocked because it contains a `minor` changeset. A reviewer will merge this at the next release if approved.'
body: 'This PR is blocked because it contains a `${{ steps.check.outputs.version }}` changeset. A reviewer will merge this at the next release if approved.'
});
14 changes: 13 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,25 @@ DEBUG=vite:[name] astro dev # debug specific process, e.g. "vite:deps" or "vit
# run this in the top-level project root to run all tests
pnpm run test
# run only a few tests in the `astro` package, great for working on a single feature
# (example - `pnpm run test:match "cli"` runs `cli.test.js`)
# (example - `pnpm run test:match "cli"` runs tests with "cli" in the name)
pnpm run test:match "$STRING_MATCH"
# run tests on another package
# (example - `pnpm --filter @astrojs/rss run test` runs `packages/astro-rss/test/rss.test.js`)
pnpm --filter $STRING_MATCH run test
```

Most tests use [`mocha`](https://mochajs.org) as the test runner. We're slowly migrating to use [`node:test`](https://nodejs.org/api/test.html) instead through the custom [`astro-scripts test`](./scripts/cmd/test.js) command. For packages that use `node:test`, you can run these commands in their directories:

```shell
# run all of the package's tests
pnpm run test
# run only a few tests in the package
# (example - `pnpm run test -m "cli"` runs tests with "cli" in the name)
pnpm run test -m "$STRING_MATCH"
# run a single test file, you can use `node --test` directly
node --test ./test/foo.test.js
```

#### E2E tests

Certain features, like HMR and client hydration, need end-to-end tests to verify functionality in the dev server. [Playwright](https://playwright.dev/) is used to test against the dev server.
Expand Down
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.1.1"
"astro": "^4.1.2"
}
}
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.3",
"@astrojs/rss": "^4.0.1",
"@astrojs/mdx": "^2.0.4",
"@astrojs/rss": "^4.0.2",
"@astrojs/sitemap": "^3.0.4",
"astro": "^4.1.1"
"astro": "^4.1.2"
}
}
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.1.1"
"astro": "^4.1.2"
},
"peerDependencies": {
"astro": "^3.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-alpine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"@astrojs/alpinejs": "^0.3.2",
"@types/alpinejs": "^3.13.5",
"alpinejs": "^3.13.3",
"astro": "^4.1.1"
"astro": "^4.1.2"
}
}
2 changes: 1 addition & 1 deletion examples/framework-lit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@astrojs/lit": "^4.0.1",
"@webcomponents/template-shadowroot": "^0.2.1",
"astro": "^4.1.1",
"astro": "^4.1.2",
"lit": "^2.8.0"
}
}
2 changes: 1 addition & 1 deletion examples/framework-multiple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@astrojs/solid-js": "^4.0.1",
"@astrojs/svelte": "^5.0.3",
"@astrojs/vue": "^4.0.8",
"astro": "^4.1.1",
"astro": "^4.1.2",
"preact": "^10.19.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@astrojs/preact": "^3.1.0",
"@preact/signals": "^1.2.1",
"astro": "^4.1.1",
"astro": "^4.1.2",
"preact": "^10.19.2"
}
}
2 changes: 1 addition & 1 deletion examples/framework-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@astrojs/react": "^3.0.9",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"astro": "^4.1.1",
"astro": "^4.1.2",
"react": "^18.2.0",
"react-dom": "^18.2.0"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"@astrojs/solid-js": "^4.0.1",
"astro": "^4.1.1",
"astro": "^4.1.2",
"solid-js": "^1.8.5"
}
}
2 changes: 1 addition & 1 deletion examples/framework-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"@astrojs/svelte": "^5.0.3",
"astro": "^4.1.1",
"astro": "^4.1.2",
"svelte": "^4.2.5"
}
}
2 changes: 1 addition & 1 deletion examples/framework-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"@astrojs/vue": "^4.0.8",
"astro": "^4.1.1",
"astro": "^4.1.2",
"vue": "^3.3.8"
}
}
2 changes: 1 addition & 1 deletion examples/hackernews/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
},
"dependencies": {
"@astrojs/node": "^7.0.4",
"astro": "^4.1.1"
"astro": "^4.1.2"
}
}
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.1.1"
"astro": "^4.1.2"
},
"peerDependencies": {
"astro": "^3.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/middleware/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"dependencies": {
"@astrojs/node": "^7.0.4",
"astro": "^4.1.1",
"astro": "^4.1.2",
"html-minifier": "^4.0.0"
},
"devDependencies": {
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.1.1"
"astro": "^4.1.2"
}
}
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.1.1"
"astro": "^4.1.2"
}
}
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.1.1"
"astro": "^4.1.2"
}
}
2 changes: 1 addition & 1 deletion examples/ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dependencies": {
"@astrojs/node": "^7.0.4",
"@astrojs/svelte": "^5.0.3",
"astro": "^4.1.1",
"astro": "^4.1.2",
"svelte": "^4.2.5"
}
}
4 changes: 2 additions & 2 deletions examples/starlog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"astro": "astro"
},
"dependencies": {
"astro": "^4.1.1",
"astro": "^4.1.2",
"sass": "^1.69.5",
"sharp": "^0.32.5"
"sharp": "^0.32.6"
}
}
2 changes: 1 addition & 1 deletion examples/view-transitions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"devDependencies": {
"@astrojs/tailwind": "^5.1.0",
"@astrojs/node": "^7.0.4",
"astro": "^4.1.1"
"astro": "^4.1.2"
}
}
2 changes: 1 addition & 1 deletion examples/with-markdoc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
},
"dependencies": {
"@astrojs/markdoc": "^0.8.2",
"astro": "^4.1.1"
"astro": "^4.1.2"
}
}
2 changes: 1 addition & 1 deletion examples/with-markdown-plugins/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"@astrojs/markdown-remark": "^4.0.1",
"astro": "^4.1.1",
"astro": "^4.1.2",
"hast-util-select": "^6.0.2",
"rehype-autolink-headings": "^7.1.0",
"rehype-slug": "^6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/with-markdown-shiki/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^4.1.1"
"astro": "^4.1.2"
}
}
4 changes: 2 additions & 2 deletions examples/with-mdx/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.3",
"@astrojs/mdx": "^2.0.4",
"@astrojs/preact": "^3.1.0",
"astro": "^4.1.1",
"astro": "^4.1.2",
"preact": "^10.19.2"
}
}
2 changes: 1 addition & 1 deletion examples/with-nanostores/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@astrojs/preact": "^3.1.0",
"@nanostores/preact": "^0.5.0",
"astro": "^4.1.1",
"astro": "^4.1.2",
"nanostores": "^0.9.5",
"preact": "^10.19.2"
}
Expand Down
Loading

0 comments on commit 7971af9

Please sign in to comment.