From 9e021a91c57d10809f588dd47968fc0e7f8b4d5c Mon Sep 17 00:00:00 2001 From: Erika <3019731+Princesseuh@users.noreply.github.com> Date: Tue, 29 Aug 2023 16:04:25 +0200 Subject: [PATCH 01/12] feat: add generic to type params to Astro global (#8263) * feat: add generic to type params to Astro global * chore: changeset --- .changeset/heavy-countries-wonder.md | 5 +++++ packages/astro/src/@types/astro.ts | 24 +++++++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 .changeset/heavy-countries-wonder.md diff --git a/.changeset/heavy-countries-wonder.md b/.changeset/heavy-countries-wonder.md new file mode 100644 index 000000000..599f0d8bb --- /dev/null +++ b/.changeset/heavy-countries-wonder.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Add a type param to AstroGlobal to type params. This will eventually be used automatically by our tooling to provide typing and completions for `Astro.params` diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts index 86d7bc984..4a2ad5264 100644 --- a/packages/astro/src/@types/astro.ts +++ b/packages/astro/src/@types/astro.ts @@ -147,8 +147,9 @@ export interface CLIFlags { export interface AstroGlobal< Props extends Record = Record, Self = AstroComponentFactory, + Params extends Record = Record, > extends AstroGlobalPartial, - AstroSharedContext { + AstroSharedContext { /** * A full URL object of the request URL. * Equivalent to: `new URL(Astro.request.url)` @@ -174,7 +175,7 @@ export interface AstroGlobal< * * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astroparams) */ - params: AstroSharedContext['params']; + params: AstroSharedContext['params']; /** List of props passed to this component * * A common way to get specific props is through [destructuring](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment), ex: @@ -184,7 +185,7 @@ export interface AstroGlobal< * * [Astro reference](https://docs.astro.build/en/core-concepts/astro-components/#component-props) */ - props: AstroSharedContext['props']; + props: AstroSharedContext['props']; /** Information about the current request. This is a standard [Request](https://developer.mozilla.org/en-US/docs/Web/API/Request) object * * For example, to get a URL object of the current URL, you can use: @@ -1807,7 +1808,10 @@ type Body = string; export type ValidRedirectStatus = 300 | 301 | 302 | 303 | 304 | 307 | 308; // Shared types between `Astro` global and API context object -interface AstroSharedContext = Record> { +interface AstroSharedContext< + Props extends Record = Record, + RouteParams extends Record = Record, +> { /** * The address (usually IP address) of the user. Used with SSR only. */ @@ -1827,7 +1831,7 @@ interface AstroSharedContext = Record = Record = Record> - extends AstroSharedContext { +export interface APIContext< + Props extends Record = Record, + APIParams extends Record = Record, +> extends AstroSharedContext { site: URL | undefined; generator: string; /** @@ -1876,7 +1882,7 @@ export interface APIContext = Record['params']; /** * List of props passed from `getStaticPaths`. Only available to static builds. * @@ -1899,7 +1905,7 @@ export interface APIContext = Record['props']; + props: AstroSharedContext['props']; /** * Redirect to another page. Only available in SSR builds. * From 1f58a7a1bea6888868b689dac94801d554319b02 Mon Sep 17 00:00:00 2001 From: Nate Moore Date: Tue, 29 Aug 2023 09:30:11 -0500 Subject: [PATCH 02/12] Unmount framework components when islands are destroyed (#8264) * fix(view-transitions): update persistence logic for improved unmount behavior * feat(astro): add `astro:unmount` event * feat(vue): automatically unmount islands * feat(react): automatically unmount islands * feat(react): automatically unmount islands * feat(solid): automatically dispose of islands * feat(svelte): automatically destroy of islands * feat(svelte): automatically destroy of islands * feat(solid): automatically dispose of islands * feat(preact): automatically unmount islands * chore: update changeset * fix: rebase issue * chore: add clarifying comment * chore: remove duplicate changeset * chore: add changeset --- .changeset/ninety-boats-brake.md | 9 ++++++ .changeset/perfect-socks-hammer.md | 5 +++ .../astro/components/ViewTransitions.astro | 8 +++-- .../astro/src/runtime/server/astro-island.ts | 6 ++++ packages/integrations/preact/src/client.ts | 31 +++++++------------ packages/integrations/react/client-v17.js | 11 ++++--- packages/integrations/react/client.js | 10 ++++-- packages/integrations/solid/src/client.ts | 6 ++-- packages/integrations/svelte/client.js | 4 ++- packages/integrations/vue/client.js | 16 +++++----- 10 files changed, 63 insertions(+), 43 deletions(-) create mode 100644 .changeset/ninety-boats-brake.md create mode 100644 .changeset/perfect-socks-hammer.md diff --git a/.changeset/ninety-boats-brake.md b/.changeset/ninety-boats-brake.md new file mode 100644 index 000000000..30c13a820 --- /dev/null +++ b/.changeset/ninety-boats-brake.md @@ -0,0 +1,9 @@ +--- +'@astrojs/react': patch +'@astrojs/preact': patch +'@astrojs/vue': patch +'@astrojs/solid-js': patch +'@astrojs/svelte': patch +--- + +Automatically unmount islands when `astro:unmount` is fired diff --git a/.changeset/perfect-socks-hammer.md b/.changeset/perfect-socks-hammer.md new file mode 100644 index 000000000..baae63ffe --- /dev/null +++ b/.changeset/perfect-socks-hammer.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fire `astro:unmount` event when island is disconnected diff --git a/packages/astro/components/ViewTransitions.astro b/packages/astro/components/ViewTransitions.astro index 33741d535..15bad445d 100644 --- a/packages/astro/components/ViewTransitions.astro +++ b/packages/astro/components/ViewTransitions.astro @@ -163,18 +163,20 @@ const { fallback = 'animate' } = Astro.props as Props; // Everything left in the new head is new, append it all. document.head.append(...doc.head.children); - // Move over persist stuff in the body + // Persist elements in the existing body const oldBody = document.body; - document.body.replaceWith(doc.body); for (const el of oldBody.querySelectorAll(`[${PERSIST_ATTR}]`)) { const id = el.getAttribute(PERSIST_ATTR); - const newEl = document.querySelector(`[${PERSIST_ATTR}="${id}"]`); + const newEl = doc.querySelector(`[${PERSIST_ATTR}="${id}"]`); if (newEl) { // The element exists in the new page, replace it with the element // from the old page so that state is preserved. newEl.replaceWith(el); } } + // Only replace the existing body *AFTER* persistent elements are moved over + // This avoids disconnecting `astro-island` nodes multiple times + document.body.replaceWith(doc.body); // Simulate scroll behavior of Safari and // Chromium based browsers (Chrome, Edge, Opera, ...) diff --git a/packages/astro/src/runtime/server/astro-island.ts b/packages/astro/src/runtime/server/astro-island.ts index 7be630d06..e0e09eaec 100644 --- a/packages/astro/src/runtime/server/astro-island.ts +++ b/packages/astro/src/runtime/server/astro-island.ts @@ -51,6 +51,12 @@ declare const Astro: { public Component: any; public hydrator: any; static observedAttributes = ['props']; + disconnectedCallback() { + document.addEventListener('astro:after-swap', () => { + // If element wasn't persisted, fire unmount event + if (!this.isConnected) this.dispatchEvent(new CustomEvent('astro:unmount')) + }, { once: true }) + } connectedCallback() { if (!this.hasAttribute('await-children') || this.firstChild) { this.childrenConnectedCallback(); diff --git a/packages/integrations/preact/src/client.ts b/packages/integrations/preact/src/client.ts index f90614398..ad24e886b 100644 --- a/packages/integrations/preact/src/client.ts +++ b/packages/integrations/preact/src/client.ts @@ -1,6 +1,6 @@ -import { h, render, type JSX } from 'preact'; -import StaticHtml from './static-html.js'; import type { SignalLike } from './types'; +import { h, render, hydrate } from 'preact'; +import StaticHtml from './static-html.js'; const sharedSignalMap = new Map(); @@ -8,7 +8,8 @@ export default (element: HTMLElement) => async ( Component: any, props: Record, - { default: children, ...slotted }: Record + { default: children, ...slotted }: Record, + { client }: Record ) => { if (!element.hasAttribute('ssr')) return; for (const [key, value] of Object.entries(slotted)) { @@ -27,23 +28,13 @@ export default (element: HTMLElement) => } } - // eslint-disable-next-line @typescript-eslint/no-shadow - function Wrapper({ children }: { children: JSX.Element }) { - let attrs = Object.fromEntries( - Array.from(element.attributes).map((attr) => [attr.name, attr.value]) - ); - return h(element.localName, attrs, children); - } + const bootstrap = client !== 'only' ? hydrate : render; - let parent = element.parentNode as Element; - - render( - h( - Wrapper, - null, - h(Component, props, children != null ? h(StaticHtml, { value: children }) : children) - ), - parent, - element + bootstrap( + h(Component, props, children != null ? h(StaticHtml, { value: children }) : children), + element, ); + + // Preact has no "unmount" option, but you can use `render(null, element)` + element.addEventListener('astro:unmount', () => render(null, element), { once: true }) }; diff --git a/packages/integrations/react/client-v17.js b/packages/integrations/react/client-v17.js index 443109603..70bddc353 100644 --- a/packages/integrations/react/client-v17.js +++ b/packages/integrations/react/client-v17.js @@ -1,5 +1,5 @@ import { createElement } from 'react'; -import { render, hydrate } from 'react-dom'; +import { render, hydrate, unmountComponentAtNode } from 'react-dom'; import StaticHtml from './static-html.js'; export default (element) => @@ -12,8 +12,9 @@ export default (element) => props, children != null ? createElement(StaticHtml, { value: children }) : children ); - if (client === 'only') { - return render(componentEl, element); - } - return hydrate(componentEl, element); + + const isHydrate = client !== 'only'; + const bootstrap = isHydrate ? hydrate : render; + bootstrap(componentEl, element); + element.addEventListener('astro:unmount', () => unmountComponentAtNode(element), { once: true }); }; diff --git a/packages/integrations/react/client.js b/packages/integrations/react/client.js index d8948e7bb..dbd32c0c5 100644 --- a/packages/integrations/react/client.js +++ b/packages/integrations/react/client.js @@ -31,10 +31,14 @@ export default (element) => } if (client === 'only') { return startTransition(() => { - createRoot(element).render(componentEl); + const root = createRoot(element); + root.render(componentEl); + element.addEventListener('astro:unmount', () => root.unmount(), { once: true }); }); } - return startTransition(() => { - hydrateRoot(element, componentEl, renderOptions); + startTransition(() => { + const root = hydrateRoot(element, componentEl, renderOptions); + root.render(componentEl); + element.addEventListener('astro:unmount', () => root.unmount(), { once: true }); }); }; diff --git a/packages/integrations/solid/src/client.ts b/packages/integrations/solid/src/client.ts index 730db0f51..66b3767ea 100644 --- a/packages/integrations/solid/src/client.ts +++ b/packages/integrations/solid/src/client.ts @@ -9,7 +9,7 @@ export default (element: HTMLElement) => } if (!element.hasAttribute('ssr')) return; - const fn = client === 'only' ? render : hydrate; + const boostrap = client === 'only' ? render : hydrate; let _slots: Record = {}; if (Object.keys(slotted).length > 0) { @@ -30,7 +30,7 @@ export default (element: HTMLElement) => const { default: children, ...slots } = _slots; const renderId = element.dataset.solidRenderId; - fn( + const dispose = boostrap( () => createComponent(Component, { ...props, @@ -42,4 +42,6 @@ export default (element: HTMLElement) => renderId, } ); + + element.addEventListener('astro:unmount', () => dispose(), { once: true }) }; diff --git a/packages/integrations/svelte/client.js b/packages/integrations/svelte/client.js index 0d07ff2ba..99612a580 100644 --- a/packages/integrations/svelte/client.js +++ b/packages/integrations/svelte/client.js @@ -14,7 +14,7 @@ export default (target) => { try { if (import.meta.env.DEV) useConsoleFilter(); - new Component({ + const component = new Component({ target, props: { ...props, @@ -24,6 +24,8 @@ export default (target) => { hydrate: client !== 'only', $$inline: true, }); + + element.addEventListener('astro:unmount', () => component.$destroy(), { once: true }) } catch (e) { } finally { if (import.meta.env.DEV) finishUsingConsoleFilter(); diff --git a/packages/integrations/vue/client.js b/packages/integrations/vue/client.js index ca61116b2..8b2a5eede 100644 --- a/packages/integrations/vue/client.js +++ b/packages/integrations/vue/client.js @@ -21,15 +21,13 @@ export default (element) => content = h(Suspense, null, content); } - if (client === 'only') { - const app = createApp({ name, render: () => content }); - await setup(app); - app.mount(element, false); - } else { - const app = createSSRApp({ name, render: () => content }); - await setup(app); - app.mount(element, true); - } + const isHydrate = client !== 'only'; + const boostrap = isHydrate ? createSSRApp : createApp; + const app = boostrap({ name, render: () => content }); + await setup(app); + app.mount(element, isHydrate); + + element.addEventListener('astro:unmount', () => app.unmount(), { once: true }); }; function isAsync(fn) { From 51e67e0ab0e6af4f35bda4db8bf0f609c2d8e7c4 Mon Sep 17 00:00:00 2001 From: natemoo-re Date: Tue, 29 Aug 2023 14:32:02 +0000 Subject: [PATCH 03/12] [ci] format --- packages/astro/src/runtime/server/astro-island.ts | 12 ++++++++---- packages/integrations/preact/src/client.ts | 10 +++++----- packages/integrations/react/client-v17.js | 4 +++- packages/integrations/solid/src/client.ts | 2 +- packages/integrations/svelte/client.js | 4 ++-- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/packages/astro/src/runtime/server/astro-island.ts b/packages/astro/src/runtime/server/astro-island.ts index e0e09eaec..2c88f0373 100644 --- a/packages/astro/src/runtime/server/astro-island.ts +++ b/packages/astro/src/runtime/server/astro-island.ts @@ -52,10 +52,14 @@ declare const Astro: { public hydrator: any; static observedAttributes = ['props']; disconnectedCallback() { - document.addEventListener('astro:after-swap', () => { - // If element wasn't persisted, fire unmount event - if (!this.isConnected) this.dispatchEvent(new CustomEvent('astro:unmount')) - }, { once: true }) + document.addEventListener( + 'astro:after-swap', + () => { + // If element wasn't persisted, fire unmount event + if (!this.isConnected) this.dispatchEvent(new CustomEvent('astro:unmount')); + }, + { once: true } + ); } connectedCallback() { if (!this.hasAttribute('await-children') || this.firstChild) { diff --git a/packages/integrations/preact/src/client.ts b/packages/integrations/preact/src/client.ts index ad24e886b..b64431130 100644 --- a/packages/integrations/preact/src/client.ts +++ b/packages/integrations/preact/src/client.ts @@ -1,6 +1,6 @@ -import type { SignalLike } from './types'; -import { h, render, hydrate } from 'preact'; +import { h, hydrate, render } from 'preact'; import StaticHtml from './static-html.js'; +import type { SignalLike } from './types'; const sharedSignalMap = new Map(); @@ -32,9 +32,9 @@ export default (element: HTMLElement) => bootstrap( h(Component, props, children != null ? h(StaticHtml, { value: children }) : children), - element, + element ); - + // Preact has no "unmount" option, but you can use `render(null, element)` - element.addEventListener('astro:unmount', () => render(null, element), { once: true }) + element.addEventListener('astro:unmount', () => render(null, element), { once: true }); }; diff --git a/packages/integrations/react/client-v17.js b/packages/integrations/react/client-v17.js index 70bddc353..625dba6bf 100644 --- a/packages/integrations/react/client-v17.js +++ b/packages/integrations/react/client-v17.js @@ -16,5 +16,7 @@ export default (element) => const isHydrate = client !== 'only'; const bootstrap = isHydrate ? hydrate : render; bootstrap(componentEl, element); - element.addEventListener('astro:unmount', () => unmountComponentAtNode(element), { once: true }); + element.addEventListener('astro:unmount', () => unmountComponentAtNode(element), { + once: true, + }); }; diff --git a/packages/integrations/solid/src/client.ts b/packages/integrations/solid/src/client.ts index 66b3767ea..71a7db5e2 100644 --- a/packages/integrations/solid/src/client.ts +++ b/packages/integrations/solid/src/client.ts @@ -43,5 +43,5 @@ export default (element: HTMLElement) => } ); - element.addEventListener('astro:unmount', () => dispose(), { once: true }) + element.addEventListener('astro:unmount', () => dispose(), { once: true }); }; diff --git a/packages/integrations/svelte/client.js b/packages/integrations/svelte/client.js index 99612a580..73cc305c1 100644 --- a/packages/integrations/svelte/client.js +++ b/packages/integrations/svelte/client.js @@ -24,8 +24,8 @@ export default (target) => { hydrate: client !== 'only', $$inline: true, }); - - element.addEventListener('astro:unmount', () => component.$destroy(), { once: true }) + + element.addEventListener('astro:unmount', () => component.$destroy(), { once: true }); } catch (e) { } finally { if (import.meta.env.DEV) finishUsingConsoleFilter(); From 6f47c6c919724a071d0d1896a7cde6adbe7c079e Mon Sep 17 00:00:00 2001 From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com> Date: Tue, 29 Aug 2023 07:58:09 -0700 Subject: [PATCH 04/12] [ci] release (rc) (#8256) Co-authored-by: github-actions[bot] --- .changeset/pre.json | 5 ++ examples/basics/package.json | 2 +- examples/blog/package.json | 2 +- examples/component/package.json | 2 +- examples/deno/package.json | 2 +- examples/framework-alpine/package.json | 2 +- examples/framework-lit/package.json | 2 +- examples/framework-multiple/package.json | 12 +-- examples/framework-preact/package.json | 4 +- examples/framework-react/package.json | 4 +- examples/framework-solid/package.json | 4 +- examples/framework-svelte/package.json | 4 +- examples/framework-vue/package.json | 4 +- examples/hackernews/package.json | 2 +- examples/integration/package.json | 2 +- examples/middleware/package.json | 2 +- examples/minimal/package.json | 2 +- examples/non-html-pages/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/package.json | 4 +- examples/with-markdoc/package.json | 2 +- examples/with-markdown-plugins/package.json | 2 +- examples/with-markdown-shiki/package.json | 2 +- examples/with-mdx/package.json | 4 +- examples/with-nanostores/package.json | 4 +- examples/with-tailwindcss/package.json | 2 +- examples/with-vite-plugin-pwa/package.json | 2 +- examples/with-vitest/package.json | 2 +- packages/astro/CHANGELOG.md | 15 ++++ packages/astro/package.json | 2 +- packages/integrations/cloudflare/package.json | 2 +- packages/integrations/deno/package.json | 2 +- packages/integrations/markdoc/package.json | 2 +- packages/integrations/mdx/package.json | 2 +- packages/integrations/netlify/package.json | 2 +- packages/integrations/node/package.json | 2 +- packages/integrations/preact/CHANGELOG.md | 6 ++ packages/integrations/preact/package.json | 2 +- packages/integrations/react/CHANGELOG.md | 6 ++ packages/integrations/react/package.json | 2 +- packages/integrations/solid/CHANGELOG.md | 6 ++ packages/integrations/solid/package.json | 2 +- packages/integrations/svelte/CHANGELOG.md | 9 +++ packages/integrations/svelte/package.json | 4 +- packages/integrations/tailwind/package.json | 2 +- packages/integrations/vercel/package.json | 2 +- packages/integrations/vue/CHANGELOG.md | 9 +++ packages/integrations/vue/package.json | 4 +- packages/telemetry/CHANGELOG.md | 6 ++ packages/telemetry/package.json | 2 +- pnpm-lock.yaml | 80 +++++++++---------- 51 files changed, 159 insertions(+), 97 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index dc80fe9f3..e65617708 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -34,6 +34,7 @@ "angry-dogs-shake", "big-tips-whisper", "brave-cheetahs-float", + "breezy-books-notice", "chatty-ways-hunt", "chilled-ducks-grin", "clever-bats-breathe", @@ -55,6 +56,7 @@ "grumpy-pens-melt", "grumpy-years-remember", "happy-penguins-hug", + "heavy-countries-wonder", "heavy-walls-arrive", "honest-houses-deny", "large-countries-share", @@ -68,9 +70,11 @@ "neat-mugs-end", "neat-owls-run", "neat-suns-search", + "ninety-boats-brake", "odd-books-live", "olive-moles-tan", "perfect-horses-tell", + "perfect-socks-hammer", "plenty-keys-add", "popular-carrots-sneeze", "proud-fans-type", @@ -89,6 +93,7 @@ "spicy-icons-live", "spicy-stingrays-cheer", "strange-peas-agree", + "strong-needles-accept", "strong-papayas-chew", "tame-files-glow", "tasty-camels-speak", diff --git a/examples/basics/package.json b/examples/basics/package.json index a84e518a4..aea69f306 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.8" + "astro": "^3.0.0-rc.9" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index ed47d2987..2ffc6fe5a 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -14,6 +14,6 @@ "@astrojs/mdx": "^1.0.0-rc.2", "@astrojs/rss": "^3.0.0-rc.2", "@astrojs/sitemap": "^3.0.0-rc.1", - "astro": "^3.0.0-rc.8" + "astro": "^3.0.0-rc.9" } } diff --git a/examples/component/package.json b/examples/component/package.json index 04153af27..703d589e6 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^3.0.0-rc.8" + "astro": "^3.0.0-rc.9" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/deno/package.json b/examples/deno/package.json index 985033960..1c5ab6d28 100644 --- a/examples/deno/package.json +++ b/examples/deno/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.8" + "astro": "^3.0.0-rc.9" }, "devDependencies": { "@astrojs/deno": "^5.0.0-rc.2" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index af6cf3a9a..f66d47a1f 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -14,6 +14,6 @@ "@astrojs/alpinejs": "^0.3.0-rc.1", "@types/alpinejs": "^3.7.2", "alpinejs": "^3.12.3", - "astro": "^3.0.0-rc.8" + "astro": "^3.0.0-rc.9" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index bad47f0b2..cb222c8d3 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/lit": "^3.0.0-rc.1", "@webcomponents/template-shadowroot": "^0.2.1", - "astro": "^3.0.0-rc.8", + "astro": "^3.0.0-rc.9", "lit": "^2.8.0" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 33a5c46b6..8436d872b 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -11,12 +11,12 @@ "astro": "astro" }, "dependencies": { - "@astrojs/preact": "^3.0.0-rc.2", - "@astrojs/react": "^3.0.0-rc.5", - "@astrojs/solid-js": "^3.0.0-rc.3", - "@astrojs/svelte": "^4.0.0-rc.2", - "@astrojs/vue": "^3.0.0-rc.1", - "astro": "^3.0.0-rc.8", + "@astrojs/preact": "^3.0.0-rc.3", + "@astrojs/react": "^3.0.0-rc.6", + "@astrojs/solid-js": "^3.0.0-rc.4", + "@astrojs/svelte": "^4.0.0-rc.3", + "@astrojs/vue": "^3.0.0-rc.2", + "astro": "^3.0.0-rc.9", "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 index c219bf7cc..0a8efc8a0 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -11,9 +11,9 @@ "astro": "astro" }, "dependencies": { - "@astrojs/preact": "^3.0.0-rc.2", + "@astrojs/preact": "^3.0.0-rc.3", "@preact/signals": "^1.2.1", - "astro": "^3.0.0-rc.8", + "astro": "^3.0.0-rc.9", "preact": "^10.17.1" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index fb5994100..6557f7260 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -11,10 +11,10 @@ "astro": "astro" }, "dependencies": { - "@astrojs/react": "^3.0.0-rc.5", + "@astrojs/react": "^3.0.0-rc.6", "@types/react": "^18.2.21", "@types/react-dom": "^18.2.7", - "astro": "^3.0.0-rc.8", + "astro": "^3.0.0-rc.9", "react": "^18.2.0", "react-dom": "^18.2.0" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index ca9f62ee1..12be97ed2 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -11,8 +11,8 @@ "astro": "astro" }, "dependencies": { - "@astrojs/solid-js": "^3.0.0-rc.3", - "astro": "^3.0.0-rc.8", + "@astrojs/solid-js": "^3.0.0-rc.4", + "astro": "^3.0.0-rc.9", "solid-js": "^1.7.11" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index d5fbfeaf0..654358255 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -11,8 +11,8 @@ "astro": "astro" }, "dependencies": { - "@astrojs/svelte": "^4.0.0-rc.2", - "astro": "^3.0.0-rc.8", + "@astrojs/svelte": "^4.0.0-rc.3", + "astro": "^3.0.0-rc.9", "svelte": "^4.2.0" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index f9c898a0c..f00ec0e90 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -11,8 +11,8 @@ "astro": "astro" }, "dependencies": { - "@astrojs/vue": "^3.0.0-rc.1", - "astro": "^3.0.0-rc.8", + "@astrojs/vue": "^3.0.0-rc.2", + "astro": "^3.0.0-rc.9", "vue": "^3.3.4" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index ff243bc21..4cbd7a572 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/node": "^6.0.0-rc.1", - "astro": "^3.0.0-rc.8" + "astro": "^3.0.0-rc.9" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index ede5da738..6f44d74f0 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^3.0.0-rc.8" + "astro": "^3.0.0-rc.9" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/middleware/package.json b/examples/middleware/package.json index 40fd9b7d0..c3809ab9d 100644 --- a/examples/middleware/package.json +++ b/examples/middleware/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@astrojs/node": "^6.0.0-rc.1", - "astro": "^3.0.0-rc.8", + "astro": "^3.0.0-rc.9", "html-minifier": "^4.0.0" } } diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 9847530df..57caba2dc 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.8" + "astro": "^3.0.0-rc.9" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 60c8161f5..52c22b898 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.8" + "astro": "^3.0.0-rc.9" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index fe4e920e6..7767c8161 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.8" + "astro": "^3.0.0-rc.9" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index f1323487f..36b551de4 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -13,8 +13,8 @@ }, "dependencies": { "@astrojs/node": "^6.0.0-rc.1", - "@astrojs/svelte": "^4.0.0-rc.2", - "astro": "^3.0.0-rc.8", + "@astrojs/svelte": "^4.0.0-rc.3", + "astro": "^3.0.0-rc.9", "svelte": "^4.2.0" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index ec2f05f19..538783670 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.5.0-rc.1", - "astro": "^3.0.0-rc.8" + "astro": "^3.0.0-rc.9" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 9b5755a76..8b6841398 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/markdown-remark": "^3.0.0-rc.1", - "astro": "^3.0.0-rc.8", + "astro": "^3.0.0-rc.9", "hast-util-select": "^5.0.5", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.1.0", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index 0b8a2fdd9..54c7f15bc 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.8" + "astro": "^3.0.0-rc.9" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 1bd17a990..2bc6caf93 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -12,8 +12,8 @@ }, "dependencies": { "@astrojs/mdx": "^1.0.0-rc.2", - "@astrojs/preact": "^3.0.0-rc.2", - "astro": "^3.0.0-rc.8", + "@astrojs/preact": "^3.0.0-rc.3", + "astro": "^3.0.0-rc.9", "preact": "^10.17.1" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index bb834f862..bf2da8ef2 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -11,9 +11,9 @@ "astro": "astro" }, "dependencies": { - "@astrojs/preact": "^3.0.0-rc.2", + "@astrojs/preact": "^3.0.0-rc.3", "@nanostores/preact": "^0.5.0", - "astro": "^3.0.0-rc.8", + "astro": "^3.0.0-rc.9", "nanostores": "^0.9.3", "preact": "^10.17.1" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 7060689ec..016d9aebc 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -14,7 +14,7 @@ "@astrojs/mdx": "^1.0.0-rc.2", "@astrojs/tailwind": "^5.0.0-rc.1", "@types/canvas-confetti": "^1.6.0", - "astro": "^3.0.0-rc.8", + "astro": "^3.0.0-rc.9", "autoprefixer": "^10.4.15", "canvas-confetti": "^1.6.0", "postcss": "^8.4.28", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index d35f6d0ea..9c2171cdc 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.8", + "astro": "^3.0.0-rc.9", "vite-plugin-pwa": "0.16.4", "workbox-window": "^7.0.0" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index e9bdc37fa..93e310037 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^3.0.0-rc.8", + "astro": "^3.0.0-rc.9", "vitest": "^0.34.2" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 31fc6ba53..fb62deac3 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,20 @@ # astro +## 3.0.0-rc.9 + +### Patch Changes + +- [#8234](https://github.com/withastro/astro/pull/8234) [`0c7b42dc6`](https://github.com/withastro/astro/commit/0c7b42dc6780e687e416137539f55a3a427d1d10) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Update telemetry notice + +- [#8263](https://github.com/withastro/astro/pull/8263) [`9e021a91c`](https://github.com/withastro/astro/commit/9e021a91c57d10809f588dd47968fc0e7f8b4d5c) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Add a type param to AstroGlobal to type params. This will eventually be used automatically by our tooling to provide typing and completions for `Astro.params` + +- [#8264](https://github.com/withastro/astro/pull/8264) [`1f58a7a1b`](https://github.com/withastro/astro/commit/1f58a7a1bea6888868b689dac94801d554319b02) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Fire `astro:unmount` event when island is disconnected + +- [#8258](https://github.com/withastro/astro/pull/8258) [`1db4e92c1`](https://github.com/withastro/astro/commit/1db4e92c12ed73681217f5cefd39f2f47542f961) Thanks [@matthewp](https://github.com/matthewp)! - Allow fallback animations on html element + +- Updated dependencies [[`0c7b42dc6`](https://github.com/withastro/astro/commit/0c7b42dc6780e687e416137539f55a3a427d1d10)]: + - @astrojs/telemetry@3.0.0-rc.4 + ## 3.0.0-rc.8 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 61788e4c5..cb5d30fa7 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "3.0.0-rc.8", + "version": "3.0.0-rc.9", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index ff4afbf31..720cdcb7b 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -45,7 +45,7 @@ "tiny-glob": "^0.2.9" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.8" + "astro": "workspace:^3.0.0-rc.9" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json index 04bdd4c1c..c08793e30 100644 --- a/packages/integrations/deno/package.json +++ b/packages/integrations/deno/package.json @@ -36,7 +36,7 @@ "esbuild": "^0.19.2" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.8" + "astro": "workspace:^3.0.0-rc.9" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json index e1a743b1d..5d5539a29 100644 --- a/packages/integrations/markdoc/package.json +++ b/packages/integrations/markdoc/package.json @@ -75,7 +75,7 @@ "zod": "3.21.1" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.8" + "astro": "workspace:^3.0.0-rc.9" }, "devDependencies": { "@astrojs/markdown-remark": "workspace:*", diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json index d6b10b8ac..c5bc1f0c9 100644 --- a/packages/integrations/mdx/package.json +++ b/packages/integrations/mdx/package.json @@ -54,7 +54,7 @@ "vfile": "^5.3.7" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.8" + "astro": "workspace:^3.0.0-rc.9" }, "devDependencies": { "@types/chai": "^4.3.5", diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index 94a5d6728..a401078c8 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -43,7 +43,7 @@ "esbuild": "^0.19.2" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.8" + "astro": "workspace:^3.0.0-rc.9" }, "devDependencies": { "@netlify/edge-functions": "^2.0.0", diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index 4b9c0e64c..f7114f917 100644 --- a/packages/integrations/node/package.json +++ b/packages/integrations/node/package.json @@ -37,7 +37,7 @@ "server-destroy": "^1.0.1" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.8" + "astro": "workspace:^3.0.0-rc.9" }, "devDependencies": { "@types/node": "^18.17.8", diff --git a/packages/integrations/preact/CHANGELOG.md b/packages/integrations/preact/CHANGELOG.md index f813b8666..449f2dc0c 100644 --- a/packages/integrations/preact/CHANGELOG.md +++ b/packages/integrations/preact/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/preact +## 3.0.0-rc.3 + +### Patch Changes + +- [#8264](https://github.com/withastro/astro/pull/8264) [`1f58a7a1b`](https://github.com/withastro/astro/commit/1f58a7a1bea6888868b689dac94801d554319b02) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Automatically unmount islands when `astro:unmount` is fired + ## 3.0.0-rc.2 ### Major Changes diff --git a/packages/integrations/preact/package.json b/packages/integrations/preact/package.json index bb9ea440f..7841a5326 100644 --- a/packages/integrations/preact/package.json +++ b/packages/integrations/preact/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/preact", "description": "Use Preact components within Astro", - "version": "3.0.0-rc.2", + "version": "3.0.0-rc.3", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/integrations/react/CHANGELOG.md b/packages/integrations/react/CHANGELOG.md index d13699931..f0e3dcc46 100644 --- a/packages/integrations/react/CHANGELOG.md +++ b/packages/integrations/react/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/react +## 3.0.0-rc.6 + +### Patch Changes + +- [#8264](https://github.com/withastro/astro/pull/8264) [`1f58a7a1b`](https://github.com/withastro/astro/commit/1f58a7a1bea6888868b689dac94801d554319b02) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Automatically unmount islands when `astro:unmount` is fired + ## 3.0.0-rc.5 ### Patch Changes diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json index 35dd39d78..8eea984a8 100644 --- a/packages/integrations/react/package.json +++ b/packages/integrations/react/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/react", "description": "Use React components within Astro", - "version": "3.0.0-rc.5", + "version": "3.0.0-rc.6", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/integrations/solid/CHANGELOG.md b/packages/integrations/solid/CHANGELOG.md index af7a3547a..4230c9447 100644 --- a/packages/integrations/solid/CHANGELOG.md +++ b/packages/integrations/solid/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/solid-js +## 3.0.0-rc.4 + +### Patch Changes + +- [#8264](https://github.com/withastro/astro/pull/8264) [`1f58a7a1b`](https://github.com/withastro/astro/commit/1f58a7a1bea6888868b689dac94801d554319b02) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Automatically unmount islands when `astro:unmount` is fired + ## 3.0.0-rc.3 ### Major Changes diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json index c5dac3b45..c813091cf 100644 --- a/packages/integrations/solid/package.json +++ b/packages/integrations/solid/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/solid-js", - "version": "3.0.0-rc.3", + "version": "3.0.0-rc.4", "description": "Use Solid components within Astro", "type": "module", "types": "./dist/index.d.ts", diff --git a/packages/integrations/svelte/CHANGELOG.md b/packages/integrations/svelte/CHANGELOG.md index 4bb4ab434..220bafe32 100644 --- a/packages/integrations/svelte/CHANGELOG.md +++ b/packages/integrations/svelte/CHANGELOG.md @@ -1,5 +1,14 @@ # @astrojs/svelte +## 4.0.0-rc.3 + +### Patch Changes + +- [#8264](https://github.com/withastro/astro/pull/8264) [`1f58a7a1b`](https://github.com/withastro/astro/commit/1f58a7a1bea6888868b689dac94801d554319b02) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Automatically unmount islands when `astro:unmount` is fired + +- Updated dependencies [[`0c7b42dc6`](https://github.com/withastro/astro/commit/0c7b42dc6780e687e416137539f55a3a427d1d10), [`9e021a91c`](https://github.com/withastro/astro/commit/9e021a91c57d10809f588dd47968fc0e7f8b4d5c), [`1f58a7a1b`](https://github.com/withastro/astro/commit/1f58a7a1bea6888868b689dac94801d554319b02), [`1db4e92c1`](https://github.com/withastro/astro/commit/1db4e92c12ed73681217f5cefd39f2f47542f961)]: + - astro@3.0.0-rc.9 + ## 4.0.0-rc.2 ### Major Changes diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index 82269986f..5a897f954 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/svelte", - "version": "4.0.0-rc.2", + "version": "4.0.0-rc.3", "description": "Use Svelte components within Astro", "type": "module", "types": "./dist/index.d.ts", @@ -48,7 +48,7 @@ "vite": "^4.4.9" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.8", + "astro": "workspace:^3.0.0-rc.9", "svelte": "^3.55.0 || ^4.0.0" }, "engines": { diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json index 371fd51c6..47d6222fe 100644 --- a/packages/integrations/tailwind/package.json +++ b/packages/integrations/tailwind/package.json @@ -43,7 +43,7 @@ "vite": "^4.4.9" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.8", + "astro": "workspace:^3.0.0-rc.9", "tailwindcss": "^3.0.24" } } diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index fd0f745ca..1a9b45ea1 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -60,7 +60,7 @@ "web-vitals": "^3.4.0" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.8" + "astro": "workspace:^3.0.0-rc.9" }, "devDependencies": { "@types/set-cookie-parser": "^2.4.3", diff --git a/packages/integrations/vue/CHANGELOG.md b/packages/integrations/vue/CHANGELOG.md index 2c87b6d67..988ad2f11 100644 --- a/packages/integrations/vue/CHANGELOG.md +++ b/packages/integrations/vue/CHANGELOG.md @@ -1,5 +1,14 @@ # @astrojs/vue +## 3.0.0-rc.2 + +### Patch Changes + +- [#8264](https://github.com/withastro/astro/pull/8264) [`1f58a7a1b`](https://github.com/withastro/astro/commit/1f58a7a1bea6888868b689dac94801d554319b02) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Automatically unmount islands when `astro:unmount` is fired + +- Updated dependencies [[`0c7b42dc6`](https://github.com/withastro/astro/commit/0c7b42dc6780e687e416137539f55a3a427d1d10), [`9e021a91c`](https://github.com/withastro/astro/commit/9e021a91c57d10809f588dd47968fc0e7f8b4d5c), [`1f58a7a1b`](https://github.com/withastro/astro/commit/1f58a7a1bea6888868b689dac94801d554319b02), [`1db4e92c1`](https://github.com/withastro/astro/commit/1db4e92c12ed73681217f5cefd39f2f47542f961)]: + - astro@3.0.0-rc.9 + ## 3.0.0-rc.1 ### Major Changes diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index 4edafd274..add3f796d 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/vue", - "version": "3.0.0-rc.1", + "version": "3.0.0-rc.2", "description": "Use Vue components within Astro", "type": "module", "types": "./dist/index.d.ts", @@ -56,7 +56,7 @@ "vue": "^3.3.4" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.8", + "astro": "workspace:^3.0.0-rc.9", "vue": "^3.2.30" }, "engines": { diff --git a/packages/telemetry/CHANGELOG.md b/packages/telemetry/CHANGELOG.md index 5237b053b..8069cc6c2 100644 --- a/packages/telemetry/CHANGELOG.md +++ b/packages/telemetry/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/telemetry +## 3.0.0-rc.4 + +### Patch Changes + +- [#8234](https://github.com/withastro/astro/pull/8234) [`0c7b42dc6`](https://github.com/withastro/astro/commit/0c7b42dc6780e687e416137539f55a3a427d1d10) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Update telemetry notice + ## 3.0.0-rc.3 ### Major Changes diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 40eb01489..6af19ba3b 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/telemetry", - "version": "3.0.0-rc.3", + "version": "3.0.0-rc.4", "type": "module", "types": "./dist/types/index.d.ts", "author": "withastro", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 528e2062a..9bce0630f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -125,7 +125,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro examples/blog: @@ -140,19 +140,19 @@ importers: specifier: ^3.0.0-rc.1 version: link:../../packages/integrations/sitemap astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro examples/deno: dependencies: astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro devDependencies: '@astrojs/deno': @@ -171,7 +171,7 @@ importers: specifier: ^3.12.3 version: 3.12.3 astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro examples/framework-lit: @@ -183,7 +183,7 @@ importers: specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro lit: specifier: ^2.8.0 @@ -192,22 +192,22 @@ importers: examples/framework-multiple: dependencies: '@astrojs/preact': - specifier: ^3.0.0-rc.2 + specifier: ^3.0.0-rc.3 version: link:../../packages/integrations/preact '@astrojs/react': - specifier: ^3.0.0-rc.5 + specifier: ^3.0.0-rc.6 version: link:../../packages/integrations/react '@astrojs/solid-js': - specifier: ^3.0.0-rc.3 + specifier: ^3.0.0-rc.4 version: link:../../packages/integrations/solid '@astrojs/svelte': - specifier: ^4.0.0-rc.2 + specifier: ^4.0.0-rc.3 version: link:../../packages/integrations/svelte '@astrojs/vue': - specifier: ^3.0.0-rc.1 + specifier: ^3.0.0-rc.2 version: link:../../packages/integrations/vue astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -231,13 +231,13 @@ importers: examples/framework-preact: dependencies: '@astrojs/preact': - specifier: ^3.0.0-rc.2 + specifier: ^3.0.0-rc.3 version: link:../../packages/integrations/preact '@preact/signals': specifier: ^1.2.1 version: 1.2.1(preact@10.17.1) astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -246,7 +246,7 @@ importers: examples/framework-react: dependencies: '@astrojs/react': - specifier: ^3.0.0-rc.5 + specifier: ^3.0.0-rc.6 version: link:../../packages/integrations/react '@types/react': specifier: ^18.2.21 @@ -255,7 +255,7 @@ importers: specifier: ^18.2.7 version: 18.2.7 astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro react: specifier: ^18.2.0 @@ -267,10 +267,10 @@ importers: examples/framework-solid: dependencies: '@astrojs/solid-js': - specifier: ^3.0.0-rc.3 + specifier: ^3.0.0-rc.4 version: link:../../packages/integrations/solid astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro solid-js: specifier: ^1.7.11 @@ -279,10 +279,10 @@ importers: examples/framework-svelte: dependencies: '@astrojs/svelte': - specifier: ^4.0.0-rc.2 + specifier: ^4.0.0-rc.3 version: link:../../packages/integrations/svelte astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro svelte: specifier: ^4.2.0 @@ -291,10 +291,10 @@ importers: examples/framework-vue: dependencies: '@astrojs/vue': - specifier: ^3.0.0-rc.1 + specifier: ^3.0.0-rc.2 version: link:../../packages/integrations/vue astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro vue: specifier: ^3.3.4 @@ -306,13 +306,13 @@ importers: specifier: ^6.0.0-rc.1 version: link:../../packages/integrations/node astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro examples/middleware: @@ -321,7 +321,7 @@ importers: specifier: ^6.0.0-rc.1 version: link:../../packages/integrations/node astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro html-minifier: specifier: ^4.0.0 @@ -330,19 +330,19 @@ importers: examples/minimal: dependencies: astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro examples/non-html-pages: dependencies: astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro examples/ssr: @@ -351,10 +351,10 @@ importers: specifier: ^6.0.0-rc.1 version: link:../../packages/integrations/node '@astrojs/svelte': - specifier: ^4.0.0-rc.2 + specifier: ^4.0.0-rc.3 version: link:../../packages/integrations/svelte astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro svelte: specifier: ^4.2.0 @@ -366,7 +366,7 @@ importers: specifier: ^0.5.0-rc.1 version: link:../../packages/integrations/markdoc astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro examples/with-markdown-plugins: @@ -375,7 +375,7 @@ importers: specifier: ^3.0.0-rc.1 version: link:../../packages/markdown/remark astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro hast-util-select: specifier: ^5.0.5 @@ -396,7 +396,7 @@ importers: examples/with-markdown-shiki: dependencies: astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro examples/with-mdx: @@ -405,10 +405,10 @@ importers: specifier: ^1.0.0-rc.2 version: link:../../packages/integrations/mdx '@astrojs/preact': - specifier: ^3.0.0-rc.2 + specifier: ^3.0.0-rc.3 version: link:../../packages/integrations/preact astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -417,13 +417,13 @@ importers: examples/with-nanostores: dependencies: '@astrojs/preact': - specifier: ^3.0.0-rc.2 + specifier: ^3.0.0-rc.3 version: link:../../packages/integrations/preact '@nanostores/preact': specifier: ^0.5.0 version: 0.5.0(nanostores@0.9.3)(preact@10.17.1) astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro nanostores: specifier: ^0.9.3 @@ -444,7 +444,7 @@ importers: specifier: ^1.6.0 version: 1.6.0 astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro autoprefixer: specifier: ^10.4.15 @@ -462,7 +462,7 @@ importers: examples/with-vite-plugin-pwa: dependencies: astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro vite-plugin-pwa: specifier: 0.16.4 @@ -474,7 +474,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^3.0.0-rc.8 + specifier: ^3.0.0-rc.9 version: link:../../packages/astro vitest: specifier: ^0.34.2 From a78175c1b86031ecdf946893b7b73968b279a43c Mon Sep 17 00:00:00 2001 From: Martin Trapp <94928215+martrapp@users.noreply.github.com> Date: Tue, 29 Aug 2023 17:30:52 +0200 Subject: [PATCH 05/12] added e2e tests for history navigation to fragment positions (#8265) --- .../src/pages/long-page.astro | 3 +- packages/astro/e2e/view-transitions.test.js | 45 ++++++++++++++++++- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/long-page.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/long-page.astro index 79193a331..8cd1d9de2 100644 --- a/packages/astro/e2e/fixtures/view-transitions/src/pages/long-page.astro +++ b/packages/astro/e2e/fixtures/view-transitions/src/pages/long-page.astro @@ -4,6 +4,7 @@ import Layout from '../components/Layout.astro';
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Dictum varius duis at consectetur lorem donec massa sapien faucibus. Amet mauris commodo quis imperdiet massa. Sed pulvinar proin gravida hendrerit lectus a. Magna ac placerat vestibulum lectus. Blandit cursus risus at ultrices mi tempus. Luctus venenatis lectus magna fringilla urna porttitor. Auctor eu augue ut lectus arcu bibendum at varius vel. Tristique senectus et netus et. In fermentum et sollicitudin ac orci phasellus egestas tellus rutrum. Eget lorem dolor sed viverra ipsum nunc aliquet. Amet consectetur adipiscing elit ut aliquam purus. Accumsan lacus vel facilisis volutpat est velit egestas. Felis imperdiet proin fermentum leo vel. Ut tellus elementum sagittis vitae et leo duis ut diam. Nisl pretium fusce id velit. Lorem donec massa sapien faucibus et. Nibh sed pulvinar proin gravida hendrerit lectus a. In est ante in nibh mauris cursus mattis molestie. @@ -30,7 +31,7 @@ import Layout from '../components/Layout.astro'; Viverra aliquet eget sit amet. Dui vivamus arcu felis bibendum. Pharetra convallis posuere morbi leo urna molestie at elementum eu. Parturient montes nascetur ridiculus mus mauris vitae. Mus mauris vitae ultricies leo integer malesuada nunc vel. Consequat semper viverra nam libero. Amet venenatis urna cursus eget nunc scelerisque. Amet risus nullam eget felis eget nunc lobortis. Venenatis urna cursus eget nunc. Sagittis id consectetur purus ut faucibus pulvinar. Posuere sollicitudin aliquam ultrices sagittis orci a scelerisque purus semper. - + Morbi tristique senectus et netus et. Neque aliquam vestibulum morbi blandit cursus risus. Pharetra pharetra massa massa ultricies mi quis. Sit amet aliquam id diam maecenas ultricies mi eget mauris. Ultrices mi tempus imperdiet nulla malesuada. At consectetur lorem donec massa sapien faucibus et molestie. Non sodales neque sodales ut etiam. Eget nunc lobortis mattis aliquam faucibus purus in massa tempor. Viverra suspendisse potenti nullam ac tortor vitae purus faucibus. Pellentesque eu tincidunt tortor aliquam nulla facilisi cras fermentum. Diam vulputate ut pharetra sit. Felis donec et odio pellentesque diam. Mollis aliquam ut porttitor leo. Vitae nunc sed velit dignissim sodales. Facilisis mauris sit amet massa vitae tortor condimentum lacinia quis. Aliquet enim tortor at auctor urna nunc id cursus. Bibendum at varius vel pharetra vel turpis nunc eget. Mattis molestie a iaculis at erat. Vel turpis nunc eget lorem dolor sed viverra ipsum nunc. Aliquam malesuada bibendum arcu vitae elementum curabitur vitae nunc sed. Nunc congue nisi vitae suscipit. Donec massa sapien faucibus et molestie ac. Nec feugiat nisl pretium fusce. At imperdiet dui accumsan sit amet nulla facilisi. Sed viverra tellus in hac. diff --git a/packages/astro/e2e/view-transitions.test.js b/packages/astro/e2e/view-transitions.test.js index 12fc63e48..11ff97e40 100644 --- a/packages/astro/e2e/view-transitions.test.js +++ b/packages/astro/e2e/view-transitions.test.js @@ -264,6 +264,28 @@ test.describe('View Transitions', () => { expect(oldScrollY).toEqual(newScrollY); }); + test('Fragment scroll position restored on back button', async ({ page, astro }) => { + // Go to the long page + await page.goto(astro.resolveUrl('/long-page')); + let locator = page.locator('#longpage'); + await expect(locator).toBeInViewport(); + + // Scroll down to middle fragment + await page.click('#click-scroll-down'); + locator = page.locator('#click-one-again'); + await expect(locator).toBeInViewport(); + + // Scroll up to top fragment + await page.click('#click-scroll-up'); + locator = page.locator('#longpage'); + await expect(locator).toBeInViewport(); + + // Back to middle of the page + await page.goBack(); + locator = page.locator('#click-one-again'); + await expect(locator).toBeInViewport(); + }); + test('Scroll position restored on forward button', async ({ page, astro }) => { // Go to page 1 await page.goto(astro.resolveUrl('/one')); @@ -290,6 +312,28 @@ test.describe('View Transitions', () => { expect(oldScrollY).toEqual(newScrollY); }); + test('Fragment scroll position restored on forward button', async ({ page, astro }) => { + // Go to the long page + await page.goto(astro.resolveUrl('/long-page')); + let locator = page.locator('#longpage'); + await expect(locator).toBeInViewport(); + + // Scroll down to middle fragment + await page.click('#click-scroll-down'); + locator = page.locator('#click-one-again'); + await expect(locator).toBeInViewport(); + + // Scroll back to top + await page.goBack(); + locator = page.locator('#longpage'); + await expect(locator).toBeInViewport(); + + // Forward to middle of page + await page.goForward(); + locator = page.locator('#click-one-again'); + await expect(locator).toBeInViewport(); + }); + test(' component forwards transitions to the ', async ({ page, astro }) => { // Go to page 1 await page.goto(astro.resolveUrl('/image-one')); @@ -402,7 +446,6 @@ test.describe('View Transitions', () => { }); test('Navigation also swaps the attributes of the document root', async ({ page, astro }) => { - page.on('console', (msg) => console.log(msg.text())); await page.goto(astro.resolveUrl('/some-attributes')); let p = page.locator('#heading'); await expect(p, 'should have content').toHaveText('Page with some attributes'); From 8450379db854fb1eaa9f38f21d65db240bc616cd Mon Sep 17 00:00:00 2001 From: Erika <3019731+Princesseuh@users.noreply.github.com> Date: Tue, 29 Aug 2023 17:54:24 +0200 Subject: [PATCH 06/12] fix: settings requiring service to be set when settings domains or remotePatterns (#8266) --- .changeset/many-impalas-sit.md | 5 +++++ packages/astro/src/core/config/schema.ts | 27 ++++++++++++++---------- 2 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 .changeset/many-impalas-sit.md diff --git a/.changeset/many-impalas-sit.md b/.changeset/many-impalas-sit.md new file mode 100644 index 000000000..ad48de4f3 --- /dev/null +++ b/.changeset/many-impalas-sit.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fix `image.service` requiring to be set manually when `image.domains` or `image.remotePatterns` was assigned a value diff --git a/packages/astro/src/core/config/schema.ts b/packages/astro/src/core/config/schema.ts index 21d153143..46ed2a01f 100644 --- a/packages/astro/src/core/config/schema.ts +++ b/packages/astro/src/core/config/schema.ts @@ -29,6 +29,9 @@ const ASTRO_CONFIG_DEFAULTS = { split: false, excludeMiddleware: false, }, + image: { + service: { entrypoint: 'astro/assets/services/sharp', config: {} }, + }, compressHTML: true, server: { host: false, @@ -180,14 +183,18 @@ export const AstroConfigSchema = z.object({ .default(ASTRO_CONFIG_DEFAULTS.redirects), image: z .object({ - service: z.object({ - entrypoint: z.union([ - z.literal('astro/assets/services/sharp'), - z.literal('astro/assets/services/squoosh'), - z.string(), - ]), - config: z.record(z.any()).default({}), - }), + service: z + .object({ + entrypoint: z + .union([ + z.literal('astro/assets/services/sharp'), + z.literal('astro/assets/services/squoosh'), + z.string(), + ]) + .default(ASTRO_CONFIG_DEFAULTS.image.service.entrypoint), + config: z.record(z.any()).default({}), + }) + .default(ASTRO_CONFIG_DEFAULTS.image.service), domains: z.array(z.string()).default([]), remotePatterns: z .array( @@ -213,9 +220,7 @@ export const AstroConfigSchema = z.object({ ) .default([]), }) - .default({ - service: { entrypoint: 'astro/assets/services/sharp', config: {} }, - }), + .default(ASTRO_CONFIG_DEFAULTS.image), markdown: z .object({ drafts: z.boolean().default(false), From e7f872e91e852b901cf221a5151077dec64305bf Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Tue, 29 Aug 2023 14:00:47 -0400 Subject: [PATCH 07/12] Prevent ViewTransition script from being added by mistake (#8268) (#8270) * Prevent ViewTransition script from being added by mistake * Add the 2-legacy branch to CI --- .changeset/swift-taxis-sing.md | 5 +++++ .github/workflows/release.yml | 1 + packages/astro/components/index.ts | 1 - packages/astro/test/code-component.test.js | 7 +++++++ 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 .changeset/swift-taxis-sing.md diff --git a/.changeset/swift-taxis-sing.md b/.changeset/swift-taxis-sing.md new file mode 100644 index 000000000..9b8bdebb4 --- /dev/null +++ b/.changeset/swift-taxis-sing.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Prevent ViewTransition script from being added by mistake diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f952f6c6b..7161a0d0f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,7 @@ on: branches: - main - "1-legacy" + - "2-legacy" - next defaults: diff --git a/packages/astro/components/index.ts b/packages/astro/components/index.ts index 6bd537087..864c7cc3b 100644 --- a/packages/astro/components/index.ts +++ b/packages/astro/components/index.ts @@ -1,3 +1,2 @@ export { default as Code } from './Code.astro'; export { default as Debug } from './Debug.astro'; -export { default as ViewTransitions } from './ViewTransitions.astro'; diff --git a/packages/astro/test/code-component.test.js b/packages/astro/test/code-component.test.js index c80107681..8481e95d8 100644 --- a/packages/astro/test/code-component.test.js +++ b/packages/astro/test/code-component.test.js @@ -23,4 +23,11 @@ describe('Code component', () => { let $ = cheerio.load(html); expect($('pre').attr('is:raw')).to.equal(undefined); }); + + // ViewTransitions bug + it('No script should be added to the page', async () => { + let html = await fixture.readFile('/index.html'); + let $ = cheerio.load(html); + expect($('script')).to.have.a.lengthOf(0); + }); }); From 834a00d2d38edaa62bc384af3075edbb0e0b8138 Mon Sep 17 00:00:00 2001 From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com> Date: Tue, 29 Aug 2023 11:18:54 -0700 Subject: [PATCH 08/12] [ci] release (rc) (#8267) Co-authored-by: github-actions[bot] --- .changeset/pre.json | 2 + examples/basics/package.json | 2 +- examples/blog/package.json | 2 +- examples/component/package.json | 2 +- examples/deno/package.json | 2 +- examples/framework-alpine/package.json | 2 +- examples/framework-lit/package.json | 2 +- examples/framework-multiple/package.json | 2 +- examples/framework-preact/package.json | 2 +- examples/framework-react/package.json | 2 +- examples/framework-solid/package.json | 2 +- examples/framework-svelte/package.json | 2 +- examples/framework-vue/package.json | 2 +- examples/hackernews/package.json | 2 +- examples/integration/package.json | 2 +- examples/middleware/package.json | 2 +- examples/minimal/package.json | 2 +- examples/non-html-pages/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/package.json | 2 +- examples/with-markdoc/package.json | 2 +- examples/with-markdown-plugins/package.json | 2 +- examples/with-markdown-shiki/package.json | 2 +- examples/with-mdx/package.json | 2 +- examples/with-nanostores/package.json | 2 +- examples/with-tailwindcss/package.json | 2 +- examples/with-vite-plugin-pwa/package.json | 2 +- examples/with-vitest/package.json | 2 +- packages/astro/CHANGELOG.md | 8 +++ packages/astro/package.json | 2 +- packages/integrations/cloudflare/package.json | 2 +- packages/integrations/deno/package.json | 2 +- packages/integrations/markdoc/package.json | 2 +- packages/integrations/mdx/package.json | 2 +- packages/integrations/netlify/package.json | 2 +- packages/integrations/node/package.json | 2 +- packages/integrations/svelte/package.json | 2 +- packages/integrations/tailwind/package.json | 2 +- packages/integrations/vercel/package.json | 2 +- packages/integrations/vue/package.json | 2 +- pnpm-lock.yaml | 54 +++++++++---------- 41 files changed, 75 insertions(+), 65 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index e65617708..389ee9e70 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -64,6 +64,7 @@ "long-chefs-jump", "loud-candles-admire", "lovely-walls-call", + "many-impalas-sit", "many-pears-explode", "mighty-dancers-lay", "nasty-garlics-listen", @@ -95,6 +96,7 @@ "strange-peas-agree", "strong-needles-accept", "strong-papayas-chew", + "swift-taxis-sing", "tame-files-glow", "tasty-camels-speak", "tasty-dragons-smash", diff --git a/examples/basics/package.json b/examples/basics/package.json index aea69f306..6596b73b4 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.9" + "astro": "^3.0.0-rc.10" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index 2ffc6fe5a..a68ac74d0 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -14,6 +14,6 @@ "@astrojs/mdx": "^1.0.0-rc.2", "@astrojs/rss": "^3.0.0-rc.2", "@astrojs/sitemap": "^3.0.0-rc.1", - "astro": "^3.0.0-rc.9" + "astro": "^3.0.0-rc.10" } } diff --git a/examples/component/package.json b/examples/component/package.json index 703d589e6..4f8431c79 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^3.0.0-rc.9" + "astro": "^3.0.0-rc.10" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/deno/package.json b/examples/deno/package.json index 1c5ab6d28..fc4d32309 100644 --- a/examples/deno/package.json +++ b/examples/deno/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.9" + "astro": "^3.0.0-rc.10" }, "devDependencies": { "@astrojs/deno": "^5.0.0-rc.2" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index f66d47a1f..7b96cb60b 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -14,6 +14,6 @@ "@astrojs/alpinejs": "^0.3.0-rc.1", "@types/alpinejs": "^3.7.2", "alpinejs": "^3.12.3", - "astro": "^3.0.0-rc.9" + "astro": "^3.0.0-rc.10" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index cb222c8d3..80db80d93 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/lit": "^3.0.0-rc.1", "@webcomponents/template-shadowroot": "^0.2.1", - "astro": "^3.0.0-rc.9", + "astro": "^3.0.0-rc.10", "lit": "^2.8.0" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 8436d872b..27d583afd 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -16,7 +16,7 @@ "@astrojs/solid-js": "^3.0.0-rc.4", "@astrojs/svelte": "^4.0.0-rc.3", "@astrojs/vue": "^3.0.0-rc.2", - "astro": "^3.0.0-rc.9", + "astro": "^3.0.0-rc.10", "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 index 0a8efc8a0..5e62cd432 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.0.0-rc.3", "@preact/signals": "^1.2.1", - "astro": "^3.0.0-rc.9", + "astro": "^3.0.0-rc.10", "preact": "^10.17.1" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 6557f7260..6a2ec1b6b 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^3.0.0-rc.6", "@types/react": "^18.2.21", "@types/react-dom": "^18.2.7", - "astro": "^3.0.0-rc.9", + "astro": "^3.0.0-rc.10", "react": "^18.2.0", "react-dom": "^18.2.0" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 12be97ed2..a31d8844f 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/solid-js": "^3.0.0-rc.4", - "astro": "^3.0.0-rc.9", + "astro": "^3.0.0-rc.10", "solid-js": "^1.7.11" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 654358255..46d6a3d63 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/svelte": "^4.0.0-rc.3", - "astro": "^3.0.0-rc.9", + "astro": "^3.0.0-rc.10", "svelte": "^4.2.0" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index f00ec0e90..9ee1050b5 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/vue": "^3.0.0-rc.2", - "astro": "^3.0.0-rc.9", + "astro": "^3.0.0-rc.10", "vue": "^3.3.4" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 4cbd7a572..0acb917a2 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/node": "^6.0.0-rc.1", - "astro": "^3.0.0-rc.9" + "astro": "^3.0.0-rc.10" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 6f44d74f0..1ebe5a8ad 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^3.0.0-rc.9" + "astro": "^3.0.0-rc.10" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/middleware/package.json b/examples/middleware/package.json index c3809ab9d..a4d16e8a5 100644 --- a/examples/middleware/package.json +++ b/examples/middleware/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@astrojs/node": "^6.0.0-rc.1", - "astro": "^3.0.0-rc.9", + "astro": "^3.0.0-rc.10", "html-minifier": "^4.0.0" } } diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 57caba2dc..eb6fb9510 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.9" + "astro": "^3.0.0-rc.10" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 52c22b898..ab4cef320 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.9" + "astro": "^3.0.0-rc.10" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 7767c8161..818d2ff39 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.9" + "astro": "^3.0.0-rc.10" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 36b551de4..c0222c7b7 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -14,7 +14,7 @@ "dependencies": { "@astrojs/node": "^6.0.0-rc.1", "@astrojs/svelte": "^4.0.0-rc.3", - "astro": "^3.0.0-rc.9", + "astro": "^3.0.0-rc.10", "svelte": "^4.2.0" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index 538783670..016bdbe02 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.5.0-rc.1", - "astro": "^3.0.0-rc.9" + "astro": "^3.0.0-rc.10" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 8b6841398..2539d2459 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/markdown-remark": "^3.0.0-rc.1", - "astro": "^3.0.0-rc.9", + "astro": "^3.0.0-rc.10", "hast-util-select": "^5.0.5", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.1.0", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index 54c7f15bc..47c5b9cbe 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.9" + "astro": "^3.0.0-rc.10" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 2bc6caf93..91a306026 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/mdx": "^1.0.0-rc.2", "@astrojs/preact": "^3.0.0-rc.3", - "astro": "^3.0.0-rc.9", + "astro": "^3.0.0-rc.10", "preact": "^10.17.1" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index bf2da8ef2..fbdf8c73f 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.0.0-rc.3", "@nanostores/preact": "^0.5.0", - "astro": "^3.0.0-rc.9", + "astro": "^3.0.0-rc.10", "nanostores": "^0.9.3", "preact": "^10.17.1" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 016d9aebc..7b8335c6e 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -14,7 +14,7 @@ "@astrojs/mdx": "^1.0.0-rc.2", "@astrojs/tailwind": "^5.0.0-rc.1", "@types/canvas-confetti": "^1.6.0", - "astro": "^3.0.0-rc.9", + "astro": "^3.0.0-rc.10", "autoprefixer": "^10.4.15", "canvas-confetti": "^1.6.0", "postcss": "^8.4.28", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index 9c2171cdc..1494b7f98 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.9", + "astro": "^3.0.0-rc.10", "vite-plugin-pwa": "0.16.4", "workbox-window": "^7.0.0" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 93e310037..27a6a3105 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^3.0.0-rc.9", + "astro": "^3.0.0-rc.10", "vitest": "^0.34.2" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index fb62deac3..d7cb0e413 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,13 @@ # astro +## 3.0.0-rc.10 + +### Patch Changes + +- [#8266](https://github.com/withastro/astro/pull/8266) [`8450379db`](https://github.com/withastro/astro/commit/8450379db854fb1eaa9f38f21d65db240bc616cd) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix `image.service` requiring to be set manually when `image.domains` or `image.remotePatterns` was assigned a value + +- [#8270](https://github.com/withastro/astro/pull/8270) [`e7f872e91`](https://github.com/withastro/astro/commit/e7f872e91e852b901cf221a5151077dec64305bf) Thanks [@matthewp](https://github.com/matthewp)! - Prevent ViewTransition script from being added by mistake + ## 3.0.0-rc.9 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index cb5d30fa7..a2048f340 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "3.0.0-rc.9", + "version": "3.0.0-rc.10", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index 720cdcb7b..22c73d946 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -45,7 +45,7 @@ "tiny-glob": "^0.2.9" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.9" + "astro": "workspace:^3.0.0-rc.10" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json index c08793e30..93c6b9dbd 100644 --- a/packages/integrations/deno/package.json +++ b/packages/integrations/deno/package.json @@ -36,7 +36,7 @@ "esbuild": "^0.19.2" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.9" + "astro": "workspace:^3.0.0-rc.10" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json index 5d5539a29..298b1ab88 100644 --- a/packages/integrations/markdoc/package.json +++ b/packages/integrations/markdoc/package.json @@ -75,7 +75,7 @@ "zod": "3.21.1" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.9" + "astro": "workspace:^3.0.0-rc.10" }, "devDependencies": { "@astrojs/markdown-remark": "workspace:*", diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json index c5bc1f0c9..522638e25 100644 --- a/packages/integrations/mdx/package.json +++ b/packages/integrations/mdx/package.json @@ -54,7 +54,7 @@ "vfile": "^5.3.7" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.9" + "astro": "workspace:^3.0.0-rc.10" }, "devDependencies": { "@types/chai": "^4.3.5", diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index a401078c8..18c45cfc2 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -43,7 +43,7 @@ "esbuild": "^0.19.2" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.9" + "astro": "workspace:^3.0.0-rc.10" }, "devDependencies": { "@netlify/edge-functions": "^2.0.0", diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index f7114f917..f364c140b 100644 --- a/packages/integrations/node/package.json +++ b/packages/integrations/node/package.json @@ -37,7 +37,7 @@ "server-destroy": "^1.0.1" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.9" + "astro": "workspace:^3.0.0-rc.10" }, "devDependencies": { "@types/node": "^18.17.8", diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index 5a897f954..fd7144831 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -48,7 +48,7 @@ "vite": "^4.4.9" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.9", + "astro": "workspace:^3.0.0-rc.10", "svelte": "^3.55.0 || ^4.0.0" }, "engines": { diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json index 47d6222fe..6feff7bb2 100644 --- a/packages/integrations/tailwind/package.json +++ b/packages/integrations/tailwind/package.json @@ -43,7 +43,7 @@ "vite": "^4.4.9" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.9", + "astro": "workspace:^3.0.0-rc.10", "tailwindcss": "^3.0.24" } } diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index 1a9b45ea1..fff57fe9a 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -60,7 +60,7 @@ "web-vitals": "^3.4.0" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.9" + "astro": "workspace:^3.0.0-rc.10" }, "devDependencies": { "@types/set-cookie-parser": "^2.4.3", diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index add3f796d..2e3f7318a 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -56,7 +56,7 @@ "vue": "^3.3.4" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.9", + "astro": "workspace:^3.0.0-rc.10", "vue": "^3.2.30" }, "engines": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9bce0630f..cd2a99e50 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -125,7 +125,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro examples/blog: @@ -140,19 +140,19 @@ importers: specifier: ^3.0.0-rc.1 version: link:../../packages/integrations/sitemap astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro examples/deno: dependencies: astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro devDependencies: '@astrojs/deno': @@ -171,7 +171,7 @@ importers: specifier: ^3.12.3 version: 3.12.3 astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro examples/framework-lit: @@ -183,7 +183,7 @@ importers: specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro lit: specifier: ^2.8.0 @@ -207,7 +207,7 @@ importers: specifier: ^3.0.0-rc.2 version: link:../../packages/integrations/vue astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -237,7 +237,7 @@ importers: specifier: ^1.2.1 version: 1.2.1(preact@10.17.1) astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -255,7 +255,7 @@ importers: specifier: ^18.2.7 version: 18.2.7 astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro react: specifier: ^18.2.0 @@ -270,7 +270,7 @@ importers: specifier: ^3.0.0-rc.4 version: link:../../packages/integrations/solid astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro solid-js: specifier: ^1.7.11 @@ -282,7 +282,7 @@ importers: specifier: ^4.0.0-rc.3 version: link:../../packages/integrations/svelte astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro svelte: specifier: ^4.2.0 @@ -294,7 +294,7 @@ importers: specifier: ^3.0.0-rc.2 version: link:../../packages/integrations/vue astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro vue: specifier: ^3.3.4 @@ -306,13 +306,13 @@ importers: specifier: ^6.0.0-rc.1 version: link:../../packages/integrations/node astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro examples/middleware: @@ -321,7 +321,7 @@ importers: specifier: ^6.0.0-rc.1 version: link:../../packages/integrations/node astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro html-minifier: specifier: ^4.0.0 @@ -330,19 +330,19 @@ importers: examples/minimal: dependencies: astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro examples/non-html-pages: dependencies: astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro examples/ssr: @@ -354,7 +354,7 @@ importers: specifier: ^4.0.0-rc.3 version: link:../../packages/integrations/svelte astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro svelte: specifier: ^4.2.0 @@ -366,7 +366,7 @@ importers: specifier: ^0.5.0-rc.1 version: link:../../packages/integrations/markdoc astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro examples/with-markdown-plugins: @@ -375,7 +375,7 @@ importers: specifier: ^3.0.0-rc.1 version: link:../../packages/markdown/remark astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro hast-util-select: specifier: ^5.0.5 @@ -396,7 +396,7 @@ importers: examples/with-markdown-shiki: dependencies: astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro examples/with-mdx: @@ -408,7 +408,7 @@ importers: specifier: ^3.0.0-rc.3 version: link:../../packages/integrations/preact astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -423,7 +423,7 @@ importers: specifier: ^0.5.0 version: 0.5.0(nanostores@0.9.3)(preact@10.17.1) astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro nanostores: specifier: ^0.9.3 @@ -444,7 +444,7 @@ importers: specifier: ^1.6.0 version: 1.6.0 astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro autoprefixer: specifier: ^10.4.15 @@ -462,7 +462,7 @@ importers: examples/with-vite-plugin-pwa: dependencies: astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro vite-plugin-pwa: specifier: 0.16.4 @@ -474,7 +474,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^3.0.0-rc.9 + specifier: ^3.0.0-rc.10 version: link:../../packages/astro vitest: specifier: ^0.34.2 From 16f09dfff7722fda99dd0412e3006a7a39c80829 Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Tue, 29 Aug 2023 15:46:06 -0400 Subject: [PATCH 09/12] Fix video persistence regression (#8271) * Fix video persistence regression * Adding a changeset --- .changeset/tame-knives-shake.md | 5 +++++ packages/astro/components/ViewTransitions.astro | 6 ++---- packages/astro/src/runtime/server/astro-island.ts | 14 ++++++-------- 3 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 .changeset/tame-knives-shake.md diff --git a/.changeset/tame-knives-shake.md b/.changeset/tame-knives-shake.md new file mode 100644 index 000000000..3801de2b3 --- /dev/null +++ b/.changeset/tame-knives-shake.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fix video persistence regression diff --git a/packages/astro/components/ViewTransitions.astro b/packages/astro/components/ViewTransitions.astro index 15bad445d..0800b0033 100644 --- a/packages/astro/components/ViewTransitions.astro +++ b/packages/astro/components/ViewTransitions.astro @@ -165,18 +165,16 @@ const { fallback = 'animate' } = Astro.props as Props; // Persist elements in the existing body const oldBody = document.body; + document.body.replaceWith(doc.body); for (const el of oldBody.querySelectorAll(`[${PERSIST_ATTR}]`)) { const id = el.getAttribute(PERSIST_ATTR); - const newEl = doc.querySelector(`[${PERSIST_ATTR}="${id}"]`); + const newEl = document.querySelector(`[${PERSIST_ATTR}="${id}"]`); if (newEl) { // The element exists in the new page, replace it with the element // from the old page so that state is preserved. newEl.replaceWith(el); } } - // Only replace the existing body *AFTER* persistent elements are moved over - // This avoids disconnecting `astro-island` nodes multiple times - document.body.replaceWith(doc.body); // Simulate scroll behavior of Safari and // Chromium based browsers (Chrome, Edge, Opera, ...) diff --git a/packages/astro/src/runtime/server/astro-island.ts b/packages/astro/src/runtime/server/astro-island.ts index 2c88f0373..b45bdcbdd 100644 --- a/packages/astro/src/runtime/server/astro-island.ts +++ b/packages/astro/src/runtime/server/astro-island.ts @@ -52,14 +52,8 @@ declare const Astro: { public hydrator: any; static observedAttributes = ['props']; disconnectedCallback() { - document.addEventListener( - 'astro:after-swap', - () => { - // If element wasn't persisted, fire unmount event - if (!this.isConnected) this.dispatchEvent(new CustomEvent('astro:unmount')); - }, - { once: true } - ); + document.removeEventListener('astro:after-swap', this.unmount); + document.addEventListener('astro:after-swap', this.unmount, { once: true }); } connectedCallback() { if (!this.hasAttribute('await-children') || this.firstChild) { @@ -176,6 +170,10 @@ declare const Astro: { attributeChangedCallback() { this.hydrate(); } + unmount = () => { + // If element wasn't persisted, fire unmount event + if (!this.isConnected) this.dispatchEvent(new CustomEvent('astro:unmount')); + } } ); } From b0e021d41b4154a0875617cdc6cabc9906beb7f8 Mon Sep 17 00:00:00 2001 From: matthewp Date: Tue, 29 Aug 2023 19:47:49 +0000 Subject: [PATCH 10/12] [ci] format --- packages/astro/src/runtime/server/astro-island.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/astro/src/runtime/server/astro-island.ts b/packages/astro/src/runtime/server/astro-island.ts index b45bdcbdd..710319aac 100644 --- a/packages/astro/src/runtime/server/astro-island.ts +++ b/packages/astro/src/runtime/server/astro-island.ts @@ -173,7 +173,7 @@ declare const Astro: { unmount = () => { // If element wasn't persisted, fire unmount event if (!this.isConnected) this.dispatchEvent(new CustomEvent('astro:unmount')); - } + }; } ); } From 28a49f8e0d6ba453b2620cf7303d030a4f03b463 Mon Sep 17 00:00:00 2001 From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com> Date: Tue, 29 Aug 2023 12:50:45 -0700 Subject: [PATCH 11/12] [ci] release (rc) (#8272) Co-authored-by: github-actions[bot] --- .changeset/pre.json | 1 + examples/basics/package.json | 2 +- examples/blog/package.json | 2 +- examples/component/package.json | 2 +- examples/deno/package.json | 2 +- examples/framework-alpine/package.json | 2 +- examples/framework-lit/package.json | 2 +- examples/framework-multiple/package.json | 2 +- examples/framework-preact/package.json | 2 +- examples/framework-react/package.json | 2 +- examples/framework-solid/package.json | 2 +- examples/framework-svelte/package.json | 2 +- examples/framework-vue/package.json | 2 +- examples/hackernews/package.json | 2 +- examples/integration/package.json | 2 +- examples/middleware/package.json | 2 +- examples/minimal/package.json | 2 +- examples/non-html-pages/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/package.json | 2 +- examples/with-markdoc/package.json | 2 +- examples/with-markdown-plugins/package.json | 2 +- examples/with-markdown-shiki/package.json | 2 +- examples/with-mdx/package.json | 2 +- examples/with-nanostores/package.json | 2 +- examples/with-tailwindcss/package.json | 2 +- examples/with-vite-plugin-pwa/package.json | 2 +- examples/with-vitest/package.json | 2 +- packages/astro/CHANGELOG.md | 6 +++ packages/astro/package.json | 2 +- packages/integrations/cloudflare/package.json | 2 +- packages/integrations/deno/package.json | 2 +- packages/integrations/markdoc/package.json | 2 +- packages/integrations/mdx/package.json | 2 +- packages/integrations/netlify/package.json | 2 +- packages/integrations/node/package.json | 2 +- packages/integrations/svelte/package.json | 2 +- packages/integrations/tailwind/package.json | 2 +- packages/integrations/vercel/package.json | 2 +- packages/integrations/vue/package.json | 2 +- pnpm-lock.yaml | 54 +++++++++---------- 41 files changed, 72 insertions(+), 65 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index 389ee9e70..65f614f2a 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -98,6 +98,7 @@ "strong-papayas-chew", "swift-taxis-sing", "tame-files-glow", + "tame-knives-shake", "tasty-camels-speak", "tasty-dragons-smash", "thin-ants-repeat", diff --git a/examples/basics/package.json b/examples/basics/package.json index 6596b73b4..f96ee7261 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.10" + "astro": "^3.0.0-rc.11" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index a68ac74d0..93ad8f6c4 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -14,6 +14,6 @@ "@astrojs/mdx": "^1.0.0-rc.2", "@astrojs/rss": "^3.0.0-rc.2", "@astrojs/sitemap": "^3.0.0-rc.1", - "astro": "^3.0.0-rc.10" + "astro": "^3.0.0-rc.11" } } diff --git a/examples/component/package.json b/examples/component/package.json index 4f8431c79..dfae4c53a 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^3.0.0-rc.10" + "astro": "^3.0.0-rc.11" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/deno/package.json b/examples/deno/package.json index fc4d32309..42d889388 100644 --- a/examples/deno/package.json +++ b/examples/deno/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.10" + "astro": "^3.0.0-rc.11" }, "devDependencies": { "@astrojs/deno": "^5.0.0-rc.2" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 7b96cb60b..99533a50a 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -14,6 +14,6 @@ "@astrojs/alpinejs": "^0.3.0-rc.1", "@types/alpinejs": "^3.7.2", "alpinejs": "^3.12.3", - "astro": "^3.0.0-rc.10" + "astro": "^3.0.0-rc.11" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 80db80d93..bfddba6cb 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/lit": "^3.0.0-rc.1", "@webcomponents/template-shadowroot": "^0.2.1", - "astro": "^3.0.0-rc.10", + "astro": "^3.0.0-rc.11", "lit": "^2.8.0" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 27d583afd..36a8a7aab 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -16,7 +16,7 @@ "@astrojs/solid-js": "^3.0.0-rc.4", "@astrojs/svelte": "^4.0.0-rc.3", "@astrojs/vue": "^3.0.0-rc.2", - "astro": "^3.0.0-rc.10", + "astro": "^3.0.0-rc.11", "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 index 5e62cd432..ae1a83097 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.0.0-rc.3", "@preact/signals": "^1.2.1", - "astro": "^3.0.0-rc.10", + "astro": "^3.0.0-rc.11", "preact": "^10.17.1" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 6a2ec1b6b..7ff5b0f26 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^3.0.0-rc.6", "@types/react": "^18.2.21", "@types/react-dom": "^18.2.7", - "astro": "^3.0.0-rc.10", + "astro": "^3.0.0-rc.11", "react": "^18.2.0", "react-dom": "^18.2.0" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index a31d8844f..99ceafe52 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/solid-js": "^3.0.0-rc.4", - "astro": "^3.0.0-rc.10", + "astro": "^3.0.0-rc.11", "solid-js": "^1.7.11" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 46d6a3d63..728581947 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/svelte": "^4.0.0-rc.3", - "astro": "^3.0.0-rc.10", + "astro": "^3.0.0-rc.11", "svelte": "^4.2.0" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 9ee1050b5..25d61e425 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/vue": "^3.0.0-rc.2", - "astro": "^3.0.0-rc.10", + "astro": "^3.0.0-rc.11", "vue": "^3.3.4" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 0acb917a2..222f73dc7 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/node": "^6.0.0-rc.1", - "astro": "^3.0.0-rc.10" + "astro": "^3.0.0-rc.11" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 1ebe5a8ad..daa57c962 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^3.0.0-rc.10" + "astro": "^3.0.0-rc.11" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/middleware/package.json b/examples/middleware/package.json index a4d16e8a5..ef91712aa 100644 --- a/examples/middleware/package.json +++ b/examples/middleware/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@astrojs/node": "^6.0.0-rc.1", - "astro": "^3.0.0-rc.10", + "astro": "^3.0.0-rc.11", "html-minifier": "^4.0.0" } } diff --git a/examples/minimal/package.json b/examples/minimal/package.json index eb6fb9510..482848c3e 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.10" + "astro": "^3.0.0-rc.11" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index ab4cef320..71d44eb61 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.10" + "astro": "^3.0.0-rc.11" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 818d2ff39..ec947a408 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.10" + "astro": "^3.0.0-rc.11" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index c0222c7b7..93ac83021 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -14,7 +14,7 @@ "dependencies": { "@astrojs/node": "^6.0.0-rc.1", "@astrojs/svelte": "^4.0.0-rc.3", - "astro": "^3.0.0-rc.10", + "astro": "^3.0.0-rc.11", "svelte": "^4.2.0" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index 016bdbe02..4eb616623 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.5.0-rc.1", - "astro": "^3.0.0-rc.10" + "astro": "^3.0.0-rc.11" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 2539d2459..3410dc718 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/markdown-remark": "^3.0.0-rc.1", - "astro": "^3.0.0-rc.10", + "astro": "^3.0.0-rc.11", "hast-util-select": "^5.0.5", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.1.0", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index 47c5b9cbe..fdc2d302e 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.10" + "astro": "^3.0.0-rc.11" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 91a306026..fe82cdbfb 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/mdx": "^1.0.0-rc.2", "@astrojs/preact": "^3.0.0-rc.3", - "astro": "^3.0.0-rc.10", + "astro": "^3.0.0-rc.11", "preact": "^10.17.1" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index fbdf8c73f..0ff05ec4f 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.0.0-rc.3", "@nanostores/preact": "^0.5.0", - "astro": "^3.0.0-rc.10", + "astro": "^3.0.0-rc.11", "nanostores": "^0.9.3", "preact": "^10.17.1" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 7b8335c6e..6ceab3626 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -14,7 +14,7 @@ "@astrojs/mdx": "^1.0.0-rc.2", "@astrojs/tailwind": "^5.0.0-rc.1", "@types/canvas-confetti": "^1.6.0", - "astro": "^3.0.0-rc.10", + "astro": "^3.0.0-rc.11", "autoprefixer": "^10.4.15", "canvas-confetti": "^1.6.0", "postcss": "^8.4.28", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index 1494b7f98..fe61b5f20 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.0-rc.10", + "astro": "^3.0.0-rc.11", "vite-plugin-pwa": "0.16.4", "workbox-window": "^7.0.0" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 27a6a3105..b0d1b2b87 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^3.0.0-rc.10", + "astro": "^3.0.0-rc.11", "vitest": "^0.34.2" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index d7cb0e413..d8811762b 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,11 @@ # astro +## 3.0.0-rc.11 + +### Patch Changes + +- [#8271](https://github.com/withastro/astro/pull/8271) [`16f09dfff`](https://github.com/withastro/astro/commit/16f09dfff7722fda99dd0412e3006a7a39c80829) Thanks [@matthewp](https://github.com/matthewp)! - Fix video persistence regression + ## 3.0.0-rc.10 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index a2048f340..5347ca0a4 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "3.0.0-rc.10", + "version": "3.0.0-rc.11", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index 22c73d946..7828448d2 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -45,7 +45,7 @@ "tiny-glob": "^0.2.9" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.10" + "astro": "workspace:^3.0.0-rc.11" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json index 93c6b9dbd..bf61415f7 100644 --- a/packages/integrations/deno/package.json +++ b/packages/integrations/deno/package.json @@ -36,7 +36,7 @@ "esbuild": "^0.19.2" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.10" + "astro": "workspace:^3.0.0-rc.11" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json index 298b1ab88..1f25f7cc5 100644 --- a/packages/integrations/markdoc/package.json +++ b/packages/integrations/markdoc/package.json @@ -75,7 +75,7 @@ "zod": "3.21.1" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.10" + "astro": "workspace:^3.0.0-rc.11" }, "devDependencies": { "@astrojs/markdown-remark": "workspace:*", diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json index 522638e25..4ce1c85c7 100644 --- a/packages/integrations/mdx/package.json +++ b/packages/integrations/mdx/package.json @@ -54,7 +54,7 @@ "vfile": "^5.3.7" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.10" + "astro": "workspace:^3.0.0-rc.11" }, "devDependencies": { "@types/chai": "^4.3.5", diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index 18c45cfc2..6c6bf49e1 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -43,7 +43,7 @@ "esbuild": "^0.19.2" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.10" + "astro": "workspace:^3.0.0-rc.11" }, "devDependencies": { "@netlify/edge-functions": "^2.0.0", diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index f364c140b..fa4069ded 100644 --- a/packages/integrations/node/package.json +++ b/packages/integrations/node/package.json @@ -37,7 +37,7 @@ "server-destroy": "^1.0.1" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.10" + "astro": "workspace:^3.0.0-rc.11" }, "devDependencies": { "@types/node": "^18.17.8", diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index fd7144831..06b304b8b 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -48,7 +48,7 @@ "vite": "^4.4.9" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.10", + "astro": "workspace:^3.0.0-rc.11", "svelte": "^3.55.0 || ^4.0.0" }, "engines": { diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json index 6feff7bb2..aaf9ddcd6 100644 --- a/packages/integrations/tailwind/package.json +++ b/packages/integrations/tailwind/package.json @@ -43,7 +43,7 @@ "vite": "^4.4.9" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.10", + "astro": "workspace:^3.0.0-rc.11", "tailwindcss": "^3.0.24" } } diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index fff57fe9a..9e7027cee 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -60,7 +60,7 @@ "web-vitals": "^3.4.0" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.10" + "astro": "workspace:^3.0.0-rc.11" }, "devDependencies": { "@types/set-cookie-parser": "^2.4.3", diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index 2e3f7318a..bd57a3b6d 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -56,7 +56,7 @@ "vue": "^3.3.4" }, "peerDependencies": { - "astro": "workspace:^3.0.0-rc.10", + "astro": "workspace:^3.0.0-rc.11", "vue": "^3.2.30" }, "engines": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cd2a99e50..32951f130 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -125,7 +125,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro examples/blog: @@ -140,19 +140,19 @@ importers: specifier: ^3.0.0-rc.1 version: link:../../packages/integrations/sitemap astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro examples/deno: dependencies: astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro devDependencies: '@astrojs/deno': @@ -171,7 +171,7 @@ importers: specifier: ^3.12.3 version: 3.12.3 astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro examples/framework-lit: @@ -183,7 +183,7 @@ importers: specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro lit: specifier: ^2.8.0 @@ -207,7 +207,7 @@ importers: specifier: ^3.0.0-rc.2 version: link:../../packages/integrations/vue astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -237,7 +237,7 @@ importers: specifier: ^1.2.1 version: 1.2.1(preact@10.17.1) astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -255,7 +255,7 @@ importers: specifier: ^18.2.7 version: 18.2.7 astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro react: specifier: ^18.2.0 @@ -270,7 +270,7 @@ importers: specifier: ^3.0.0-rc.4 version: link:../../packages/integrations/solid astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro solid-js: specifier: ^1.7.11 @@ -282,7 +282,7 @@ importers: specifier: ^4.0.0-rc.3 version: link:../../packages/integrations/svelte astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro svelte: specifier: ^4.2.0 @@ -294,7 +294,7 @@ importers: specifier: ^3.0.0-rc.2 version: link:../../packages/integrations/vue astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro vue: specifier: ^3.3.4 @@ -306,13 +306,13 @@ importers: specifier: ^6.0.0-rc.1 version: link:../../packages/integrations/node astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro examples/middleware: @@ -321,7 +321,7 @@ importers: specifier: ^6.0.0-rc.1 version: link:../../packages/integrations/node astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro html-minifier: specifier: ^4.0.0 @@ -330,19 +330,19 @@ importers: examples/minimal: dependencies: astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro examples/non-html-pages: dependencies: astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro examples/ssr: @@ -354,7 +354,7 @@ importers: specifier: ^4.0.0-rc.3 version: link:../../packages/integrations/svelte astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro svelte: specifier: ^4.2.0 @@ -366,7 +366,7 @@ importers: specifier: ^0.5.0-rc.1 version: link:../../packages/integrations/markdoc astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro examples/with-markdown-plugins: @@ -375,7 +375,7 @@ importers: specifier: ^3.0.0-rc.1 version: link:../../packages/markdown/remark astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro hast-util-select: specifier: ^5.0.5 @@ -396,7 +396,7 @@ importers: examples/with-markdown-shiki: dependencies: astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro examples/with-mdx: @@ -408,7 +408,7 @@ importers: specifier: ^3.0.0-rc.3 version: link:../../packages/integrations/preact astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -423,7 +423,7 @@ importers: specifier: ^0.5.0 version: 0.5.0(nanostores@0.9.3)(preact@10.17.1) astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro nanostores: specifier: ^0.9.3 @@ -444,7 +444,7 @@ importers: specifier: ^1.6.0 version: 1.6.0 astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro autoprefixer: specifier: ^10.4.15 @@ -462,7 +462,7 @@ importers: examples/with-vite-plugin-pwa: dependencies: astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro vite-plugin-pwa: specifier: 0.16.4 @@ -474,7 +474,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^3.0.0-rc.10 + specifier: ^3.0.0-rc.11 version: link:../../packages/astro vitest: specifier: ^0.34.2 From 264bbba4e0fb514c5c7c5f9a8289a17619a46fab Mon Sep 17 00:00:00 2001 From: Yan Thomas <61414485+Yan-Thomas@users.noreply.github.com> Date: Tue, 29 Aug 2023 19:36:28 -0300 Subject: [PATCH 12/12] Add missing backtics to `scopedStyleStrategy` value (#8275) --- packages/astro/src/@types/astro.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts index 4a2ad5264..acf11f3b0 100644 --- a/packages/astro/src/@types/astro.ts +++ b/packages/astro/src/@types/astro.ts @@ -623,7 +623,7 @@ export interface AstroUserConfig { * * Using `'class'` is helpful when you want to ensure that element selectors within an Astro component override global style defaults (e.g. from a global stylesheet). * Using `'where'` gives you more control over specifity, but requires that you use higher-specifity selectors, layers, and other tools to control which selectors are applied. - * Using 'attribute' is useful when you are manipulating the `class` attribute of elements and need to avoid conflicts between your own styling logic and Astro's application of styles. + * Using `'attribute'` is useful when you are manipulating the `class` attribute of elements and need to avoid conflicts between your own styling logic and Astro's application of styles. */ scopedStyleStrategy?: 'where' | 'class' | 'attribute';