Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterDraex committed Apr 23, 2024
2 parents 6a5b418 + 204b782 commit bba254d
Show file tree
Hide file tree
Showing 105 changed files with 1,894 additions and 2,233 deletions.
5 changes: 5 additions & 0 deletions .changeset/bright-chefs-develop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@astrojs/markdoc": minor
---

Updates `@markdoc/markdoc` to v0.4
5 changes: 5 additions & 0 deletions .changeset/spotty-dots-beg.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@astrojs/db": patch
---

Add `astro login` support from online editors like Stackblitz and GitHub Codespaces
5 changes: 5 additions & 0 deletions .changeset/sweet-coins-shop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"astro": patch
---

Prevent getCollection breaking in vitest
7 changes: 7 additions & 0 deletions .changeset/thick-wasps-know.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@astrojs/markdoc": patch
"@astrojs/vercel": patch
"astro": patch
---

Updates `esbuild` dependency to v0.20. This should not affect projects in most cases.
15 changes: 15 additions & 0 deletions .changeset/thirty-walls-yell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
"astro": patch
---

Fixes an issue where images in MD required a relative specifier (e.g. `./`)

Now, you can use the standard `![](relative/img.png)` syntax in MD files for images colocated in the same folder: no relative specifier required!

There is no need to update your project; your existing images will still continue to work. However, you may wish to remove any relative specifiers from these MD images as they are no longer necessary:

```diff
- ![A cute dog](./dog.jpg)
+ ![A cute dog](dog.jpg)
<!-- This dog lives in the same folder as my article! -->
```
5 changes: 5 additions & 0 deletions .changeset/weak-swans-sparkle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"astro": patch
---

Due to regression on mobile WebKit browsers, reverts a change made for JavaScript animations during view transitions.
5 changes: 5 additions & 0 deletions .changeset/wet-apples-accept.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@astrojs/partytown": minor
---

Updates the `@builder.io/partytown` dependency to v0.10. This should not affect projects in most cases.
29 changes: 29 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended",
"schedule:weekly",
"group:allNonMajor",
":disablePeerDependencies",
],
"labels": ["dependencies"],
"rangeStrategy": "bump",
"ignoreDeps": [
// manually bumping deps
"@biomejs/biome",
"@types/node",
"preact-render-to-string", // https://github.com/withastro/astro/pull/10200
"sharp",

// manually bumping workflow actions
"actions/labeler",

// ignore "engines" update
"node",
"npm",
"pnpm",

// follow vite deps version
"postcss-load-config",
],
}
13 changes: 0 additions & 13 deletions .github/workflows/nightly.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/snapshot-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
pull-requests: write
steps:
- name: "Check if user has admin access (only admins can publish snapshot releases)."
uses: "lannonbr/repo-permission-check-action@2.0.0"
uses: "lannonbr/repo-permission-check-action@2.0.2"
with:
permission: "admin"
env:
Expand Down
2 changes: 1 addition & 1 deletion benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@astrojs/node": "workspace:*",
"@benchmark/timer": "workspace:*",
"astro": "workspace:*",
"autocannon": "^7.12.0",
"autocannon": "^7.15.0",
"execa": "^8.0.1",
"markdown-table": "^3.0.3",
"mri": "^1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/with-vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
},
"dependencies": {
"astro": "^4.6.3",
"vitest": "^1.3.1"
"vitest": "^1.5.0"
}
}
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"test:smoke:docs": "turbo run build --filter=docs",
"test:check-examples": "node ./scripts/smoke/check.js",
"test:vite-ci": "turbo run test --filter=astro",
"test:e2e": "cd packages/astro && pnpm playwright install && pnpm run test:e2e",
"test:e2e:match": "cd packages/astro && pnpm playwright install && pnpm run test:e2e:match",
"test:e2e": "cd packages/astro && pnpm playwright install chromium && pnpm run test:e2e",
"test:e2e:match": "cd packages/astro && pnpm playwright install chromium && pnpm run test:e2e:match",
"test:e2e:hosts": "turbo run test:hosted",
"benchmark": "astro-benchmark",
"lint": "eslint . --report-unused-disable-directives",
Expand All @@ -52,27 +52,27 @@
"astro-benchmark": "workspace:*"
},
"devDependencies": {
"@astrojs/check": "^0.5.8",
"@astrojs/check": "^0.5.10",
"@biomejs/biome": "1.6.4",
"@changesets/changelog-github": "^0.4.8",
"@changesets/cli": "^2.26.2",
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.1",
"@eslint/eslintrc": "^3.0.2",
"@types/node": "^18.17.8",
"esbuild": "^0.19.6",
"eslint": "^9.0.0",
"eslint-config-prettier": "^9.0.0",
"esbuild": "^0.20.2",
"eslint": "^9.1.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-no-only-tests": "^3.1.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-regexp": "^2.2.0",
"globby": "^14.0.0",
"only-allow": "^1.1.1",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-regexp": "^2.5.0",
"globby": "^14.0.1",
"only-allow": "^1.2.1",
"organize-imports-cli": "^0.10.0",
"prettier": "^3.1.0",
"prettier-plugin-astro": "^0.12.2",
"prettier": "^3.2.5",
"prettier-plugin-astro": "^0.13.0",
"tiny-glob": "^0.2.9",
"turbo": "^1.12.4",
"typescript": "~5.2.2",
"typescript-eslint": "^7.6.0"
"turbo": "^1.13.2",
"typescript": "~5.4.5",
"typescript-eslint": "^7.7.0"
},
"pnpm": {
"packageExtensions": {
Expand Down
2 changes: 1 addition & 1 deletion packages/astro-rss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"xml2js": "0.6.2"
},
"dependencies": {
"fast-xml-parser": "^4.2.7",
"fast-xml-parser": "^4.3.6",
"kleur": "^4.1.5"
}
}
8 changes: 8 additions & 0 deletions packages/astro/e2e/astro-envs.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ const test = testFactory({
devToolbar: {
enabled: false,
},
vite: {
optimizeDeps: {
// Vite has a bug where if you close the server too quickly, while the optimized
// dependencies are still held before serving, it will stall the server from closing.
// This will workaround it for now.
holdUntilCrawlEnd: false,
},
},
});

let devServer;
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/astro-component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@astrojs/preact": "workspace:*",
"@e2e/astro-linked-lib": "link:../_deps/astro-linked-lib",
"astro": "workspace:*",
"preact": "^10.19.2"
"preact": "^10.20.2"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/astro-envs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"vue": "^3.3.8"
"vue": "^3.4.23"
}
}
12 changes: 6 additions & 6 deletions packages/astro/e2e/fixtures/client-only/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.19.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"solid-js": "^1.8.5",
"svelte": "^4.2.5",
"vue": "^3.3.8"
"preact": "^10.20.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"solid-js": "^1.8.16",
"svelte": "^4.2.15",
"vue": "^3.4.23"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"dependencies": {
"@astrojs/react": "workspace:*",
"astro": "workspace:*",
"react": "^18.0.0",
"react-dom": "^18.0.0"
"react": "^18.2.0",
"react-dom": "^18.2.0"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/dev-toolbar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.19.2"
"preact": "^10.20.2"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/error-cyclic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.19.2"
"preact": "^10.20.2"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/error-sass/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"astro": "workspace:*",
"sass": "^1.69.5"
"sass": "^1.75.0"
}
}
14 changes: 7 additions & 7 deletions packages/astro/e2e/fixtures/errors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"@astrojs/svelte": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"preact": "^10.19.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"sass": "^1.69.5",
"solid-js": "^1.8.5",
"svelte": "^4.2.5",
"vue": "^3.3.8"
"preact": "^10.20.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sass": "^1.75.0",
"solid-js": "^1.8.16",
"svelte": "^4.2.15",
"vue": "^3.4.23"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/hmr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"private": true,
"devDependencies": {
"astro": "workspace:*",
"sass": "^1.69.5"
"sass": "^1.75.0"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/hydration-race/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.19.2"
"preact": "^10.20.2"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/lit-component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@astrojs/lit": "workspace:*",
"@webcomponents/template-shadowroot": "^0.2.1",
"astro": "workspace:*",
"lit": "^3.1.0"
"lit": "^3.1.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,8 @@ export default class Counter extends LitElement {
}
}

customElements.define('my-counter', Counter);
// Since this fixture is ran in both dev and build, this could register twice. Wrap with a try..catch for now.
try {
customElements.define('my-counter', Counter);
} catch {}

Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,7 @@ export default class NonDeferredCounter extends LitElement {
}
}

customElements.define('non-deferred-counter', NonDeferredCounter);
// Since this fixture is ran in both dev and build, this could register twice. Wrap with a try..catch for now.
try {
customElements.define('non-deferred-counter', NonDeferredCounter);
} catch {}
14 changes: 7 additions & 7 deletions packages/astro/e2e/fixtures/multiple-frameworks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
},
"dependencies": {
"@webcomponents/template-shadowroot": "^0.2.1",
"lit": "^2.8.0",
"preact": "^10.19.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"solid-js": "^1.8.5",
"svelte": "^4.2.5",
"vue": "^3.3.8"
"lit": "^3.1.3",
"preact": "^10.20.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"solid-js": "^1.8.16",
"svelte": "^4.2.15",
"vue": "^3.4.23"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.19.2"
"preact": "^10.20.2"
}
}
12 changes: 6 additions & 6 deletions packages/astro/e2e/fixtures/nested-in-preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.19.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"solid-js": "^1.8.5",
"svelte": "^4.2.5",
"vue": "^3.3.8"
"preact": "^10.20.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"solid-js": "^1.8.16",
"svelte": "^4.2.15",
"vue": "^3.4.23"
}
}
12 changes: 6 additions & 6 deletions packages/astro/e2e/fixtures/nested-in-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.19.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"solid-js": "^1.8.5",
"svelte": "^4.2.5",
"vue": "^3.3.8"
"preact": "^10.20.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"solid-js": "^1.8.16",
"svelte": "^4.2.15",
"vue": "^3.4.23"
}
}
Loading

0 comments on commit bba254d

Please sign in to comment.