From d51cf5e707c45c2b1aed796b4d68461883991ebe Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Fri, 6 Oct 2023 15:50:36 -0400 Subject: [PATCH 01/15] Snapshot release: prevent setting output --- .github/workflows/snapshot-release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/snapshot-release.yml b/.github/workflows/snapshot-release.yml index 3025c60f0..6c69abfdc 100644 --- a/.github/workflows/snapshot-release.yml +++ b/.github/workflows/snapshot-release.yml @@ -80,10 +80,8 @@ jobs: - name: Publish Release id: publish run: | - pnpm run release --tag next--${{ steps.getSnapshotName.outputs.result }} > publish.output.txt 2>&1 + pnpm run release --tag next--${{ steps.getSnapshotName.outputs.result }} echo "Release complete" - cat publish.output.txt - echo ::set-output name=result::`cat publish.output.txt` env: # Needs access to publish to npm NPM_TOKEN: ${{ secrets.NPM_TOKEN }} From f9131003d7778ef2f6d8d98859db58667a371c41 Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Fri, 6 Oct 2023 15:59:49 -0400 Subject: [PATCH 02/15] Give the snapshot release the right permissions --- .github/workflows/snapshot-release.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/snapshot-release.yml b/.github/workflows/snapshot-release.yml index 6c69abfdc..752a2a697 100644 --- a/.github/workflows/snapshot-release.yml +++ b/.github/workflows/snapshot-release.yml @@ -19,6 +19,9 @@ jobs: name: Create a snapshot release of a pull request if: ${{ github.repository_owner == 'withastro' && github.event.issue.pull_request && startsWith(github.event.comment.body, '!preview') }} runs-on: ubuntu-latest + permissions: + contents: read + id-token: write steps: - name: "Check if user has admin access (only admins can publish snapshot releases)." uses: "lannonbr/repo-permission-check-action@2.0.0" @@ -80,8 +83,10 @@ jobs: - name: Publish Release id: publish run: | - pnpm run release --tag next--${{ steps.getSnapshotName.outputs.result }} + pnpm run release --tag next--${{ steps.getSnapshotName.outputs.result }} > publish.output.txt 2>&1 echo "Release complete" + cat publish.output.txt + echo ::set-output name=result::`cat publish.output.txt` env: # Needs access to publish to npm NPM_TOKEN: ${{ secrets.NPM_TOKEN }} From 2262814a92f7f8d410c217140211cdcd404585d0 Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Fri, 6 Oct 2023 16:11:29 -0400 Subject: [PATCH 03/15] Give snapshot releases the issues: write permission --- .github/workflows/snapshot-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/snapshot-release.yml b/.github/workflows/snapshot-release.yml index 752a2a697..8fce35f42 100644 --- a/.github/workflows/snapshot-release.yml +++ b/.github/workflows/snapshot-release.yml @@ -22,6 +22,7 @@ jobs: permissions: contents: read id-token: write + issues: write steps: - name: "Check if user has admin access (only admins can publish snapshot releases)." uses: "lannonbr/repo-permission-check-action@2.0.0" From 30de324361bc261956eb9fc08fe60a82ff602a9b Mon Sep 17 00:00:00 2001 From: Martin Trapp <94928215+martrapp@users.noreply.github.com> Date: Fri, 6 Oct 2023 23:17:27 +0200 Subject: [PATCH 04/15] Revert fix #8472 (#8767) --- .changeset/great-bears-watch.md | 9 +++++++++ packages/astro/e2e/view-transitions.test.js | 2 +- packages/astro/src/transitions/router.ts | 21 --------------------- 3 files changed, 10 insertions(+), 22 deletions(-) create mode 100644 .changeset/great-bears-watch.md diff --git a/.changeset/great-bears-watch.md b/.changeset/great-bears-watch.md new file mode 100644 index 000000000..ced76bad7 --- /dev/null +++ b/.changeset/great-bears-watch.md @@ -0,0 +1,9 @@ +--- +'astro': patch +--- + +Revert fix #8472 + +[#8472](https://github.com/withastro/astro/pull/8472) caused some style files from previous pages to not be cleanly deleted on view transitions. For a discussion of a future fix for the original issue [#8144](https://github.com/withastro/astro/issues/8114) see [#8745](https://github.com/withastro/astro/pull/8745). + + diff --git a/packages/astro/e2e/view-transitions.test.js b/packages/astro/e2e/view-transitions.test.js index 31e3128f5..f8bbad1cd 100644 --- a/packages/astro/e2e/view-transitions.test.js +++ b/packages/astro/e2e/view-transitions.test.js @@ -648,7 +648,7 @@ test.describe('View Transitions', () => { expect(loads.length, 'There should be 2 page loads').toEqual(2); }); - test('client:only styles are retained on transition', async ({ page, astro }) => { + test.skip('client:only styles are retained on transition', async ({ page, astro }) => { const totalExpectedStyles = 7; // Go to page 1 diff --git a/packages/astro/src/transitions/router.ts b/packages/astro/src/transitions/router.ts index 1049f92d1..e4dc9d52d 100644 --- a/packages/astro/src/transitions/router.ts +++ b/packages/astro/src/transitions/router.ts @@ -42,11 +42,6 @@ const announce = () => { }; const PERSIST_ATTR = 'data-astro-transition-persist'; const parser = new DOMParser(); -// explained at its usage -let noopEl: HTMLDivElement; -if (import.meta.env.DEV) { - noopEl = document.createElement('div'); -} // The History API does not tell you if navigation is forward or back, so // you can figure it using an index. On pushState the index is incremented so you @@ -198,22 +193,6 @@ async function updateDOM( const href = el.getAttribute('href'); return newDocument.head.querySelector(`link[rel=stylesheet][href="${href}"]`); } - // What follows is a fix for an issue (#8472) with missing client:only styles after transition. - // That problem exists only in dev mode where styles are injected into the page by Vite. - // Returning a noop element ensures that the styles are not removed from the old document. - // Guarding the code below with the dev mode check - // allows tree shaking to remove this code in production. - if (import.meta.env.DEV) { - if (el.tagName === 'STYLE' && el.dataset.viteDevId) { - const devId = el.dataset.viteDevId; - // If this same style tag exists, remove it from the new page - return ( - newDocument.querySelector(`style[data-vite-dev-id="${devId}"]`) || - // Otherwise, keep it anyways. This is client:only styles. - noopEl - ); - } - } return null; }; From eaed844ea8f2f52e0c9caa40bb3ec7377e10595f Mon Sep 17 00:00:00 2001 From: Makito Date: Sun, 8 Oct 2023 03:22:47 +0800 Subject: [PATCH 05/15] fix(assets): add the missing `await` to getHTMLAttributes (#8773) --- .changeset/young-taxis-battle.md | 5 +++++ packages/astro/src/assets/internal.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/young-taxis-battle.md diff --git a/.changeset/young-taxis-battle.md b/.changeset/young-taxis-battle.md new file mode 100644 index 000000000..66d0ad1d4 --- /dev/null +++ b/.changeset/young-taxis-battle.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fix an issue where HTML attributes do not render if getHTMLAttributes in an image service returns a Promise \ No newline at end of file diff --git a/packages/astro/src/assets/internal.ts b/packages/astro/src/assets/internal.ts index 9cb48f588..310b746a8 100644 --- a/packages/astro/src/assets/internal.ts +++ b/packages/astro/src/assets/internal.ts @@ -111,7 +111,7 @@ export async function getImage( src: imageURL, attributes: service.getHTMLAttributes !== undefined - ? service.getHTMLAttributes(validatedOptions, imageConfig) + ? await service.getHTMLAttributes(validatedOptions, imageConfig) : {}, }; } From 93b092266febfad16a48575f8eee12d5910bf071 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Mon, 9 Oct 2023 17:29:28 +0800 Subject: [PATCH 06/15] Make CSS chunk names less confusing (#8754) --- .changeset/sharp-insects-yawn.md | 5 ++ .../astro/src/core/build/css-asset-name.ts | 54 ++++++++++++++++--- .../src/core/build/plugins/plugin-css.ts | 15 +----- 3 files changed, 52 insertions(+), 22 deletions(-) create mode 100644 .changeset/sharp-insects-yawn.md diff --git a/.changeset/sharp-insects-yawn.md b/.changeset/sharp-insects-yawn.md new file mode 100644 index 000000000..742517633 --- /dev/null +++ b/.changeset/sharp-insects-yawn.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Make CSS chunk names less confusing diff --git a/packages/astro/src/core/build/css-asset-name.ts b/packages/astro/src/core/build/css-asset-name.ts index 6e9e2a1c2..29fc14294 100644 --- a/packages/astro/src/core/build/css-asset-name.ts +++ b/packages/astro/src/core/build/css-asset-name.ts @@ -1,4 +1,4 @@ -import type { GetModuleInfo } from 'rollup'; +import type { GetModuleInfo, ModuleInfo } from 'rollup'; import crypto from 'node:crypto'; import npath from 'node:path'; @@ -6,20 +6,29 @@ import type { AstroSettings } from '../../@types/astro.js'; import { viteID } from '../util.js'; import { getTopLevelPages } from './graph.js'; +// These pages could be used as base names for the chunk hashed name, but they are confusing +// and should be avoided it possible +const confusingBaseNames = ['404', '500']; + // The short name for when the hash can be included // We could get rid of this and only use the createSlugger implementation, but this creates // slightly prettier names. export function shortHashedName(id: string, ctx: { getModuleInfo: GetModuleInfo }): string { const parents = Array.from(getTopLevelPages(id, ctx)); - const firstParentId = parents[0]?.[0].id; - const firstParentName = firstParentId ? npath.parse(firstParentId).name : 'index'; + return createNameHash( + getFirstParentId(parents), + parents.map(([page]) => page.id) + ); +} +export function createNameHash(baseId: string | undefined, hashIds: string[]): string { + const baseName = baseId ? prettifyBaseName(npath.parse(baseId).name) : 'index'; const hash = crypto.createHash('sha256'); - for (const [page] of parents) { - hash.update(page.id, 'utf-8'); + for (const id of hashIds) { + hash.update(id, 'utf-8'); } const h = hash.digest('hex').slice(0, 8); - const proposedName = firstParentName + '.' + h; + const proposedName = baseName + '.' + h; return proposedName; } @@ -34,7 +43,7 @@ export function createSlugger(settings: AstroSettings) { .map(([page]) => page.id) .sort() .join('-'); - const firstParentId = parents[0]?.[0].id || indexPage; + const firstParentId = getFirstParentId(parents) || indexPage; // Use the last two segments, for ex /docs/index let dir = firstParentId; @@ -45,7 +54,7 @@ export function createSlugger(settings: AstroSettings) { break; } - const name = npath.parse(npath.basename(dir)).name; + const name = prettifyBaseName(npath.parse(npath.basename(dir)).name); key = key.length ? name + sep + key : name; dir = npath.dirname(dir); i++; @@ -76,3 +85,32 @@ export function createSlugger(settings: AstroSettings) { return name; }; } + +/** + * Find the first parent id from `parents` where its name is not confusing. + * Returns undefined if there's no parents. + */ +function getFirstParentId(parents: [ModuleInfo, number, number][]) { + for (const parent of parents) { + const id = parent[0].id; + const baseName = npath.parse(id).name; + if (!confusingBaseNames.includes(baseName)) { + return id; + } + } + // If all parents are confusing, just use the first one. Or if there's no + // parents, this will return undefined. + return parents[0]?.[0].id; +} + +const charsToReplaceRe = /[.\[\]]/g; +const underscoresRe = /_+/g; +/** + * Prettify base names so they're easier to read: + * - index -> index + * - [slug] -> _slug_ + * - [...spread] -> _spread_ + */ +function prettifyBaseName(str: string) { + return str.replace(charsToReplaceRe, '_').replace(underscoresRe, '_'); +} diff --git a/packages/astro/src/core/build/plugins/plugin-css.ts b/packages/astro/src/core/build/plugins/plugin-css.ts index 85652e13b..5e24f85d2 100644 --- a/packages/astro/src/core/build/plugins/plugin-css.ts +++ b/packages/astro/src/core/build/plugins/plugin-css.ts @@ -1,5 +1,3 @@ -import * as crypto from 'node:crypto'; -import * as npath from 'node:path'; import type { GetModuleInfo } from 'rollup'; import { type ResolvedConfig, type Plugin as VitePlugin } from 'vite'; import { isBuildableCSSRequest } from '../../../vite-plugin-astro-server/util.js'; @@ -93,7 +91,7 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] { if (new URL(pageInfo.id, 'file://').searchParams.has(PROPAGATED_ASSET_FLAG)) { // Split delayed assets to separate modules // so they can be injected where needed - const chunkId = createNameHash(id, [id]); + const chunkId = assetName.createNameHash(id, [id]); internals.cssModuleToChunkIdMap.set(id, chunkId); return chunkId; } @@ -272,17 +270,6 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] { /***** UTILITY FUNCTIONS *****/ -function createNameHash(baseId: string, hashIds: string[]): string { - const baseName = baseId ? npath.parse(baseId).name : 'index'; - const hash = crypto.createHash('sha256'); - for (const id of hashIds) { - hash.update(id, 'utf-8'); - } - const h = hash.digest('hex').slice(0, 8); - const proposedName = baseName + '.' + h; - return proposedName; -} - function* getParentClientOnlys( id: string, ctx: { getModuleInfo: GetModuleInfo }, From 33d0be50be6516559c01347692edd80b638a862c Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Mon, 9 Oct 2023 20:47:06 +0800 Subject: [PATCH 07/15] Fix snapshot release permissions (#8777) --- .github/workflows/snapshot-release.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/snapshot-release.yml b/.github/workflows/snapshot-release.yml index 8fce35f42..ad3968e21 100644 --- a/.github/workflows/snapshot-release.yml +++ b/.github/workflows/snapshot-release.yml @@ -20,9 +20,10 @@ jobs: if: ${{ github.repository_owner == 'withastro' && github.event.issue.pull_request && startsWith(github.event.comment.body, '!preview') }} runs-on: ubuntu-latest permissions: - contents: read - id-token: write - issues: write + contents: read + id-token: write + issues: write + pull-requests: write steps: - name: "Check if user has admin access (only admins can publish snapshot releases)." uses: "lannonbr/repo-permission-check-action@2.0.0" From c24f70d91601dd3a6b5a84f04d61824e775e9b44 Mon Sep 17 00:00:00 2001 From: Martin Trapp <94928215+martrapp@users.noreply.github.com> Date: Mon, 9 Oct 2023 16:15:23 +0200 Subject: [PATCH 08/15] Fix flickering during view transitions (#8772) * Fix for #8711 * more descriptive changeset * chores, while we are at it ... --- .changeset/seven-seas-hide.md | 5 +++ .../src/components/listener-layout.astro | 34 +++++++++++++++++++ .../src/pages/listener-one.astro | 6 ++++ .../src/pages/listener-two.astro | 6 ++++ packages/astro/e2e/view-transitions.test.js | 22 ++++++++++++ packages/astro/src/transitions/router.ts | 12 +++++-- 6 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 .changeset/seven-seas-hide.md create mode 100644 packages/astro/e2e/fixtures/view-transitions/src/components/listener-layout.astro create mode 100644 packages/astro/e2e/fixtures/view-transitions/src/pages/listener-one.astro create mode 100644 packages/astro/e2e/fixtures/view-transitions/src/pages/listener-two.astro diff --git a/.changeset/seven-seas-hide.md b/.changeset/seven-seas-hide.md new file mode 100644 index 000000000..1b758f404 --- /dev/null +++ b/.changeset/seven-seas-hide.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fix flickering during view transitions diff --git a/packages/astro/e2e/fixtures/view-transitions/src/components/listener-layout.astro b/packages/astro/e2e/fixtures/view-transitions/src/components/listener-layout.astro new file mode 100644 index 000000000..9f6265335 --- /dev/null +++ b/packages/astro/e2e/fixtures/view-transitions/src/components/listener-layout.astro @@ -0,0 +1,34 @@ +--- +import { ViewTransitions } from 'astro:transitions'; +--- + + + + + +

Local transitions

+ + + + + diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/listener-one.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/listener-one.astro new file mode 100644 index 000000000..a331e52e2 --- /dev/null +++ b/packages/astro/e2e/fixtures/view-transitions/src/pages/listener-one.astro @@ -0,0 +1,6 @@ +--- +import ListenerLayout from '../components/listener-layout.astro'; +--- + + Go to listener two + diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/listener-two.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/listener-two.astro new file mode 100644 index 000000000..35191a333 --- /dev/null +++ b/packages/astro/e2e/fixtures/view-transitions/src/pages/listener-two.astro @@ -0,0 +1,6 @@ +--- +import ListenerLayout from '../components/listener-layout.astro'; +--- + + Go to listener one + diff --git a/packages/astro/e2e/view-transitions.test.js b/packages/astro/e2e/view-transitions.test.js index f8bbad1cd..80342cb35 100644 --- a/packages/astro/e2e/view-transitions.test.js +++ b/packages/astro/e2e/view-transitions.test.js @@ -230,6 +230,28 @@ test.describe('View Transitions', () => { await expect(h, 'imported CSS updated').toHaveCSS('background-color', 'rgba(0, 0, 0, 0)'); }); + test('No page rendering during swap()', async ({ page, astro }) => { + let transitions = 0; + page.on('console', (msg) => { + if (msg.type() === 'info' && msg.text() === 'transitionstart') ++transitions; + }); + + // Go to page 1 + await page.goto(astro.resolveUrl('/listener-one')); + let p = page.locator('#totwo'); + await expect(p, 'should have content').toHaveText('Go to listener two'); + // on load a CSS transition is started triggered by a class on the html element + expect(transitions).toEqual(1); + + // go to page 2 + await page.click('#totwo'); + p = page.locator('#toone'); + await expect(p, 'should have content').toHaveText('Go to listener one'); + // swap() resets that class, the after-swap listener sets it again. + // the temporarily missing class must not trigger page rendering + expect(transitions).toEqual(1); + }); + test('click hash links does not do navigation', async ({ page, astro }) => { // Go to page 1 await page.goto(astro.resolveUrl('/one')); diff --git a/packages/astro/src/transitions/router.ts b/packages/astro/src/transitions/router.ts index e4dc9d52d..096f4abb5 100644 --- a/packages/astro/src/transitions/router.ts +++ b/packages/astro/src/transitions/router.ts @@ -146,18 +146,24 @@ function isInfinite(animation: Animation) { const updateHistoryAndScrollPosition = (toLocation: URL, replace: boolean, intraPage: boolean) => { const fresh = !samePage(toLocation); + let scrolledToTop = false; if (toLocation.href !== location.href) { if (replace) { history.replaceState({ ...history.state }, '', toLocation.href); } else { history.replaceState({ ...history.state, intraPage }, ''); - history.pushState({ index: ++currentHistoryIndex, scrollX, scrollY }, '', toLocation.href); + history.pushState( + { index: ++currentHistoryIndex, scrollX: 0, scrollY: 0 }, + '', + toLocation.href + ); } // now we are on the new page for non-history navigations! // (with history navigation page change happens before popstate is fired) // freshly loaded pages start from the top if (fresh) { scrollTo({ left: 0, top: 0, behavior: 'instant' }); + scrolledToTop = true; } } if (toLocation.hash) { @@ -166,7 +172,9 @@ const updateHistoryAndScrollPosition = (toLocation: URL, replace: boolean, intra // that won't reload the page but instead scroll to the fragment location.href = toLocation.href; } else { - scrollTo({ left: 0, top: 0, behavior: 'instant' }); + if (!scrolledToTop) { + scrollTo({ left: 0, top: 0, behavior: 'instant' }); + } } }; From 29cdfa024886dd581cb207586f7dfec6966bdd4e Mon Sep 17 00:00:00 2001 From: Martin Trapp <94928215+martrapp@users.noreply.github.com> Date: Mon, 9 Oct 2023 16:19:46 +0200 Subject: [PATCH 09/15] Fix transition attributes on islands (#8776) * Fix transition attributes on islands * Incorporate comments from review --- .changeset/wise-lions-lay.md | 5 +++++ .../astro/src/runtime/server/hydration.ts | 15 ++++++++++++--- .../src/runtime/server/render/component.ts | 6 +++--- .../view-transitions/astro.config.mjs | 7 +++++++ .../fixtures/view-transitions/package.json | 5 ++++- .../src/components/Island.css | 11 +++++++++++ .../src/components/Island.jsx | 19 +++++++++++++++++++ .../src/pages/hasIsland.astro | 10 ++++++++++ packages/astro/test/view-transitions.test.js | 10 ++++++++++ pnpm-lock.yaml | 9 +++++++++ 10 files changed, 90 insertions(+), 7 deletions(-) create mode 100644 .changeset/wise-lions-lay.md create mode 100644 packages/astro/test/fixtures/view-transitions/astro.config.mjs create mode 100644 packages/astro/test/fixtures/view-transitions/src/components/Island.css create mode 100644 packages/astro/test/fixtures/view-transitions/src/components/Island.jsx create mode 100644 packages/astro/test/fixtures/view-transitions/src/pages/hasIsland.astro diff --git a/.changeset/wise-lions-lay.md b/.changeset/wise-lions-lay.md new file mode 100644 index 000000000..5718740fe --- /dev/null +++ b/.changeset/wise-lions-lay.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fix transition attributes on islands diff --git a/packages/astro/src/runtime/server/hydration.ts b/packages/astro/src/runtime/server/hydration.ts index 09f42a9b5..8c5635105 100644 --- a/packages/astro/src/runtime/server/hydration.ts +++ b/packages/astro/src/runtime/server/hydration.ts @@ -12,13 +12,16 @@ export interface HydrationMetadata { directive: string; value: string; componentUrl: string; - componentExport: { value: string }; + componentExport: { value: string; }; } +type Props = Record; + interface ExtractedProps { isPage: boolean; hydration: HydrationMetadata | null; - props: Record; + props: Props; + propsWithoutTransitionAttributes: Props; } const transitionDirectivesToCopyOnIsland = Object.freeze([ @@ -26,16 +29,18 @@ const transitionDirectivesToCopyOnIsland = Object.freeze([ 'data-astro-transition-persist', ]); + // Used to extract the directives, aka `client:load` information about a component. // Finds these special props and removes them from what gets passed into the component. export function extractDirectives( - inputProps: Record, + inputProps: Props, clientDirectives: SSRResult['clientDirectives'] ): ExtractedProps { let extracted: ExtractedProps = { isPage: false, hydration: null, props: {}, + propsWithoutTransitionAttributes: {}, }; for (const [key, value] of Object.entries(inputProps)) { if (key.startsWith('server:')) { @@ -96,10 +101,14 @@ export function extractDirectives( } } else { extracted.props[key] = value; + if (!transitionDirectivesToCopyOnIsland.includes(key)) { + extracted.propsWithoutTransitionAttributes[key] = value; + } } } for (const sym of Object.getOwnPropertySymbols(inputProps)) { extracted.props[sym] = inputProps[sym]; + extracted.propsWithoutTransitionAttributes[sym] = inputProps[sym]; } return extracted; diff --git a/packages/astro/src/runtime/server/render/component.ts b/packages/astro/src/runtime/server/render/component.ts index 158a88a07..91d74e812 100644 --- a/packages/astro/src/runtime/server/render/component.ts +++ b/packages/astro/src/runtime/server/render/component.ts @@ -92,7 +92,7 @@ async function renderFrameworkComponent( displayName, }; - const { hydration, isPage, props } = extractDirectives(_props, clientDirectives); + const { hydration, isPage, props, propsWithoutTransitionAttributes } = extractDirectives(_props, clientDirectives); let html = ''; let attrs: Record | undefined = undefined; @@ -217,7 +217,7 @@ async function renderFrameworkComponent( ({ html, attrs } = await renderer.ssr.renderToStaticMarkup.call( { result }, Component, - props, + propsWithoutTransitionAttributes, children, metadata )); @@ -242,7 +242,7 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr ({ html, attrs } = await renderer.ssr.renderToStaticMarkup.call( { result }, Component, - props, + propsWithoutTransitionAttributes, children, metadata )); diff --git a/packages/astro/test/fixtures/view-transitions/astro.config.mjs b/packages/astro/test/fixtures/view-transitions/astro.config.mjs new file mode 100644 index 000000000..8a6f1951c --- /dev/null +++ b/packages/astro/test/fixtures/view-transitions/astro.config.mjs @@ -0,0 +1,7 @@ +import { defineConfig } from 'astro/config'; +import react from '@astrojs/react'; + +// https://astro.build/config +export default defineConfig({ + integrations: [react()], +}); diff --git a/packages/astro/test/fixtures/view-transitions/package.json b/packages/astro/test/fixtures/view-transitions/package.json index bc6790df4..41cee5081 100644 --- a/packages/astro/test/fixtures/view-transitions/package.json +++ b/packages/astro/test/fixtures/view-transitions/package.json @@ -3,6 +3,9 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "workspace:*" + "astro": "workspace:*", + "@astrojs/react": "workspace:*", + "react": "^18.1.0", + "react-dom": "^18.1.0" } } diff --git a/packages/astro/test/fixtures/view-transitions/src/components/Island.css b/packages/astro/test/fixtures/view-transitions/src/components/Island.css new file mode 100644 index 000000000..fb21044d7 --- /dev/null +++ b/packages/astro/test/fixtures/view-transitions/src/components/Island.css @@ -0,0 +1,11 @@ +.counter { + display: grid; + font-size: 2em; + grid-template-columns: repeat(3, minmax(0, 1fr)); + margin-top: 2em; + place-items: center; +} + +.counter-message { + text-align: center; +} diff --git a/packages/astro/test/fixtures/view-transitions/src/components/Island.jsx b/packages/astro/test/fixtures/view-transitions/src/components/Island.jsx new file mode 100644 index 000000000..cde384980 --- /dev/null +++ b/packages/astro/test/fixtures/view-transitions/src/components/Island.jsx @@ -0,0 +1,19 @@ +import React, { useState } from 'react'; +import './Island.css'; + +export default function Counter({ children, count: initialCount, id }) { + const [count, setCount] = useState(initialCount); + const add = () => setCount((i) => i + 1); + const subtract = () => setCount((i) => i - 1); + + return ( + <> +
+ + 
{count}
+ +
+
{children}
+ + ); +} diff --git a/packages/astro/test/fixtures/view-transitions/src/pages/hasIsland.astro b/packages/astro/test/fixtures/view-transitions/src/pages/hasIsland.astro new file mode 100644 index 000000000..378afb180 --- /dev/null +++ b/packages/astro/test/fixtures/view-transitions/src/pages/hasIsland.astro @@ -0,0 +1,10 @@ +--- +import Island from '../components/Island.jsx'; +--- + + + + + + + diff --git a/packages/astro/test/view-transitions.test.js b/packages/astro/test/view-transitions.test.js index 6d4d19cbb..008a6e09f 100644 --- a/packages/astro/test/view-transitions.test.js +++ b/packages/astro/test/view-transitions.test.js @@ -22,4 +22,14 @@ describe('View Transitions styles', () => { expect($('head style')).to.have.a.lengthOf(3); }); + + it('should not duplicate transition attributes on island contents', async () => { + let res = await fixture.fetch('/hasIsland'); + let html = await res.text(); + let $ = cheerio.load(html); + expect($('astro-island[data-astro-transition-persist]')).to.have.a.lengthOf(1); + expect( + $('astro-island[data-astro-transition-persist] > [data-astro-transition-persist]') + ).to.have.a.lengthOf(0); + }); }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d70075993..c39875566 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3531,9 +3531,18 @@ importers: packages/astro/test/fixtures/view-transitions: dependencies: + '@astrojs/react': + specifier: workspace:* + version: link:../../../../integrations/react astro: specifier: workspace:* version: link:../../.. + react: + specifier: ^18.1.0 + version: 18.2.0 + react-dom: + specifier: ^18.1.0 + version: 18.2.0(react@18.2.0) packages/astro/test/fixtures/virtual-astro-file: dependencies: From 160d1cd755e70af1d8ec294d01dd2cb32d60db50 Mon Sep 17 00:00:00 2001 From: Florian Lefebvre Date: Mon, 9 Oct 2023 16:21:26 +0200 Subject: [PATCH 10/15] feat(tailwind): create a tailwind.config.mjs file by default (#8638) --- .changeset/early-ghosts-hang.md | 6 ++++++ packages/astro/src/cli/add/index.ts | 4 ++-- packages/integrations/tailwind/README.md | 6 +++--- packages/integrations/tailwind/src/index.ts | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 .changeset/early-ghosts-hang.md diff --git a/.changeset/early-ghosts-hang.md b/.changeset/early-ghosts-hang.md new file mode 100644 index 000000000..41215d739 --- /dev/null +++ b/.changeset/early-ghosts-hang.md @@ -0,0 +1,6 @@ +--- +'@astrojs/tailwind': patch +'astro': patch +--- + +The `@astrojs/tailwind` integration now creates a `tailwind.config.mjs` file by default diff --git a/packages/astro/src/cli/add/index.ts b/packages/astro/src/cli/add/index.ts index afd63716b..859a95c0a 100644 --- a/packages/astro/src/cli/add/index.ts +++ b/packages/astro/src/cli/add/index.ts @@ -50,7 +50,7 @@ const ALIASES = new Map([ ]); const ASTRO_CONFIG_STUB = `import { defineConfig } from 'astro/config';\n\nexport default defineConfig({});`; const TAILWIND_CONFIG_STUB = `/** @type {import('tailwindcss').Config} */ -module.exports = { +export default { content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'], theme: { extend: {}, @@ -160,7 +160,7 @@ export async function add(names: string[], { flags }: AddOptions) { './tailwind.config.mjs', './tailwind.config.js', ], - defaultConfigFile: './tailwind.config.cjs', + defaultConfigFile: './tailwind.config.mjs', defaultConfigContent: TAILWIND_CONFIG_STUB, }); } diff --git a/packages/integrations/tailwind/README.md b/packages/integrations/tailwind/README.md index ecbe37d1a..6cbfd7ada 100644 --- a/packages/integrations/tailwind/README.md +++ b/packages/integrations/tailwind/README.md @@ -94,7 +94,7 @@ https://user-images.githubusercontent.com/4033662/169918388-8ed153b2-0ba0-4b24-b ### Configuring Tailwind -If you used the Quick Install instructions and said yes to each prompt, you'll see a `tailwind.config.cjs` file in your project's root directory. Use this file for your Tailwind configuration changes. You can learn how to customize Tailwind using this file [in the Tailwind docs](https://tailwindcss.com/docs/configuration). +If you used the Quick Install instructions and said yes to each prompt, you'll see a `tailwind.config.mjs` file in your project's root directory. Use this file for your Tailwind configuration changes. You can learn how to customize Tailwind using this file [in the Tailwind docs](https://tailwindcss.com/docs/configuration). If it isn't there, you add your own `tailwind.config.(js|cjs|mjs)` file to the root directory and the integration will use its configurations. This can be great if you already have Tailwind configured in another project and want to bring those settings over to this one. @@ -178,8 +178,8 @@ error The `text-special` class does not exist. If `text-special` is a custom c [Instead of using `@layer` directives in a global stylesheet](https://tailwindcss.com/docs/functions-and-directives#using-apply-with-per-component-css), define your custom styles by adding a plugin to your Tailwind config to fix it: ```js -// tailwind.config.cjs -module.exports = { +// tailwind.config.mjs +export default { // ... plugins: [ function ({ addComponents, theme }) { diff --git a/packages/integrations/tailwind/src/index.ts b/packages/integrations/tailwind/src/index.ts index 700f16937..daee5f857 100644 --- a/packages/integrations/tailwind/src/index.ts +++ b/packages/integrations/tailwind/src/index.ts @@ -50,7 +50,7 @@ async function getViteConfiguration( type TailwindOptions = { /** * Path to your tailwind config file - * @default 'tailwind.config.js' + * @default 'tailwind.config.mjs' */ configFile?: string; /** From a0dc79b94673567e97f0031c84b919f07789a3db Mon Sep 17 00:00:00 2001 From: bluwy Date: Mon, 9 Oct 2023 14:23:53 +0000 Subject: [PATCH 11/15] [ci] format --- packages/astro/src/runtime/server/hydration.ts | 3 +-- packages/astro/src/runtime/server/render/component.ts | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/astro/src/runtime/server/hydration.ts b/packages/astro/src/runtime/server/hydration.ts index 8c5635105..4c8b71ba8 100644 --- a/packages/astro/src/runtime/server/hydration.ts +++ b/packages/astro/src/runtime/server/hydration.ts @@ -12,7 +12,7 @@ export interface HydrationMetadata { directive: string; value: string; componentUrl: string; - componentExport: { value: string; }; + componentExport: { value: string }; } type Props = Record; @@ -29,7 +29,6 @@ const transitionDirectivesToCopyOnIsland = Object.freeze([ 'data-astro-transition-persist', ]); - // Used to extract the directives, aka `client:load` information about a component. // Finds these special props and removes them from what gets passed into the component. export function extractDirectives( diff --git a/packages/astro/src/runtime/server/render/component.ts b/packages/astro/src/runtime/server/render/component.ts index 91d74e812..002f4ebaf 100644 --- a/packages/astro/src/runtime/server/render/component.ts +++ b/packages/astro/src/runtime/server/render/component.ts @@ -92,7 +92,10 @@ async function renderFrameworkComponent( displayName, }; - const { hydration, isPage, props, propsWithoutTransitionAttributes } = extractDirectives(_props, clientDirectives); + const { hydration, isPage, props, propsWithoutTransitionAttributes } = extractDirectives( + _props, + clientDirectives + ); let html = ''; let attrs: Record | undefined = undefined; From c4a7ec4255e7acb9555cb8bb74ea13c5fbb2ac17 Mon Sep 17 00:00:00 2001 From: Arsh <69170106+lilnasy@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:58:09 +0000 Subject: [PATCH 12/15] fix(windows): ensure drive letter is uppercase (#8741) --- .changeset/large-clouds-sip.md | 5 +++++ packages/astro/astro.js | 7 +++++++ 2 files changed, 12 insertions(+) create mode 100644 .changeset/large-clouds-sip.md diff --git a/.changeset/large-clouds-sip.md b/.changeset/large-clouds-sip.md new file mode 100644 index 000000000..c271de43c --- /dev/null +++ b/.changeset/large-clouds-sip.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fixed an issue on Windows where lowercase drive letters in current working directory led to missing scripts and styles. diff --git a/packages/astro/astro.js b/packages/astro/astro.js index f227ae9e9..b1b5106db 100755 --- a/packages/astro/astro.js +++ b/packages/astro/astro.js @@ -32,6 +32,13 @@ async function main() { } } + // windows drive letters can sometimes be lowercase, which vite cannot process + if (process.platform === 'win32') { + const cwd = process.cwd() + const correctedCwd = cwd.slice(0, 1).toUpperCase() + cwd.slice(1) + if (correctedCwd !== cwd) process.chdir(correctedCwd) + } + return import('./dist/cli/index.js') .then(({ cli }) => cli(process.argv)) .catch((error) => { From 7ea27f6319da6db7b3de8e22a11a80d0ac45872f Mon Sep 17 00:00:00 2001 From: ematipico Date: Mon, 9 Oct 2023 16:00:28 +0000 Subject: [PATCH 13/15] [ci] format --- packages/astro/astro.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/astro/astro.js b/packages/astro/astro.js index b1b5106db..e067b9dd9 100755 --- a/packages/astro/astro.js +++ b/packages/astro/astro.js @@ -32,12 +32,12 @@ async function main() { } } - // windows drive letters can sometimes be lowercase, which vite cannot process - if (process.platform === 'win32') { - const cwd = process.cwd() - const correctedCwd = cwd.slice(0, 1).toUpperCase() + cwd.slice(1) - if (correctedCwd !== cwd) process.chdir(correctedCwd) - } + // windows drive letters can sometimes be lowercase, which vite cannot process + if (process.platform === 'win32') { + const cwd = process.cwd(); + const correctedCwd = cwd.slice(0, 1).toUpperCase() + cwd.slice(1); + if (correctedCwd !== cwd) process.chdir(correctedCwd); + } return import('./dist/cli/index.js') .then(({ cli }) => cli(process.argv)) From 054c5c6447d79dd4ea7ab6ce0f9ec836abebd211 Mon Sep 17 00:00:00 2001 From: Jonathan Dunlap <595843+jadbox@users.noreply.github.com> Date: Mon, 9 Oct 2023 13:13:46 -0400 Subject: [PATCH 14/15] fix(cloudflare): support for 'cloudflare:*' imports (#8766) * chore: add 'cloudflare:sockets' to external list * chore: add Changeset * patch: wildcard cloudflare packages * chore: updated Readme for cloudflare module support * Update .changeset/heavy-elephants-tan.md Co-authored-by: Sarah Rainsberger * Update packages/integrations/cloudflare/README.md Co-authored-by: Sarah Rainsberger --------- Co-authored-by: Sarah Rainsberger Co-authored-by: Alexander Niebuhr --- .changeset/heavy-elephants-tan.md | 5 +++++ packages/integrations/cloudflare/README.md | 4 ++++ packages/integrations/cloudflare/src/index.ts | 2 ++ 3 files changed, 11 insertions(+) create mode 100644 .changeset/heavy-elephants-tan.md diff --git a/.changeset/heavy-elephants-tan.md b/.changeset/heavy-elephants-tan.md new file mode 100644 index 000000000..4dc2b8579 --- /dev/null +++ b/.changeset/heavy-elephants-tan.md @@ -0,0 +1,5 @@ +--- +'@astrojs/cloudflare': patch +--- + +Adds `cloudflare:sockets` compile support diff --git a/packages/integrations/cloudflare/README.md b/packages/integrations/cloudflare/README.md index 10a381a7b..a72e2f1d4 100644 --- a/packages/integrations/cloudflare/README.md +++ b/packages/integrations/cloudflare/README.md @@ -357,6 +357,10 @@ import { Buffer } from 'node:buffer'; Additionally, you'll need to enable the Compatibility Flag in Cloudflare. The configuration for this flag may vary based on where you deploy your Astro site. For detailed guidance, please refer to the [Cloudflare documentation on enabling Node.js compatibility](https://developers.cloudflare.com/workers/runtime-apis/nodejs). +## Cloudflare module support + +All Cloudflare namespaced packages (e.g. `cloudflare:sockets`) are allowlisted for use. Note that the package `cloudflare:sockets` does not work locally without using Wrangler dev mode. + ## Preview with Wrangler To use [`wrangler`](https://developers.cloudflare.com/workers/wrangler/) to run your application locally, update the preview script: diff --git a/packages/integrations/cloudflare/src/index.ts b/packages/integrations/cloudflare/src/index.ts index 59cd92ce3..c0da2dd74 100644 --- a/packages/integrations/cloudflare/src/index.ts +++ b/packages/integrations/cloudflare/src/index.ts @@ -290,6 +290,7 @@ export default function createIntegration(args?: Options): AstroIntegration { 'node:stream', 'node:string_decoder', 'node:util', + 'cloudflare:*' ], entryPoints: pathsGroup, outbase: absolutePagesDirname, @@ -371,6 +372,7 @@ export default function createIntegration(args?: Options): AstroIntegration { 'node:stream', 'node:string_decoder', 'node:util', + 'cloudflare:*' ], entryPoints: [entryPath], outfile: buildPath, From 90d70eb7c4ceddf7246e338100e01de7dc8756f6 Mon Sep 17 00:00:00 2001 From: alexanderniebuhr Date: Mon, 9 Oct 2023 17:16:02 +0000 Subject: [PATCH 15/15] [ci] format --- packages/integrations/cloudflare/src/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/integrations/cloudflare/src/index.ts b/packages/integrations/cloudflare/src/index.ts index c0da2dd74..c0af8eb14 100644 --- a/packages/integrations/cloudflare/src/index.ts +++ b/packages/integrations/cloudflare/src/index.ts @@ -290,7 +290,7 @@ export default function createIntegration(args?: Options): AstroIntegration { 'node:stream', 'node:string_decoder', 'node:util', - 'cloudflare:*' + 'cloudflare:*', ], entryPoints: pathsGroup, outbase: absolutePagesDirname, @@ -372,7 +372,7 @@ export default function createIntegration(args?: Options): AstroIntegration { 'node:stream', 'node:string_decoder', 'node:util', - 'cloudflare:*' + 'cloudflare:*', ], entryPoints: [entryPath], outfile: buildPath,