Simplify nested hydration flow

[bluwy]

Changes

Fixes #7283

Also cleans up unused files that were added in:

• Improve nested and client:only hydration #3455
• Consolidate hydration scripts into just one #3571
• Inline hydration directive scripts #3605

Testing

Existing tests should pass as it refactors the hydration code. especially e2e

Docs

n/a. internal refactor.

[changeset-bot]

🦋 Changeset detected

Latest commit: aa276cd

The changes in this PR will be included in the next version bump.

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

[bluwy]

!preview simple-nested-hydration

[github-actions]

 > root@0.0.0 release /home/runner/work/astro/astro > pnpm run build && changeset publish "--tag" "next--simple-nested-hydration" > root@0.0.0 build /home/runner/work/astro/astro > turbo run build --filter=astro --filter=create-astro --filter="@astrojs/*" --filter="@benchmark/*" �[2m• Packages in scope: @astrojs/alpinejs, @astrojs/cloudflare, @astrojs/deno, @astrojs/image, @astrojs/internal-helpers, @astrojs/lit, @astrojs/markdoc, @astrojs/markdown-component, @astrojs/markdown-remark, @astrojs/mdx, @astrojs/netlify, @astrojs/node, @astrojs/partytown, @astrojs/preact, @astrojs/prefetch, @astrojs/prism, @astrojs/react, @astrojs/rss, @astrojs/sitemap, @astrojs/solid-js, @astrojs/svelte, @astrojs/tailwind, @astrojs/telemetry, @astrojs/turbolinks, @astrojs/underscore-redirects, @astrojs/vercel, @astrojs/vue, @astrojs/webapi, @benchmark/timer, astro, create-astro�[0m �[2m• Running�[0m �[2m�[1mbuild�[0m�[0m �[2min 31 packages�[0m �[2m• Remote caching enabled�[0m �[35m@astrojs/webapi:build: �[0mcache hit, suppressing output �[2m148d7b975b98543a�[0m �[33m@astrojs/internal-helpers:build: �[0mcache hit, suppressing output �[2mf3566c825673df15�[0m �[32m@astrojs/telemetry:build: �[0mcache hit, suppressing output �[2md69e33e51c9c3b58�[0m �[36mcreate-astro:build: �[0mcache hit, suppressing output �[2mc0189683f0b99d20�[0m �[34m@astrojs/prism:build: �[0mcache hit, suppressing output �[2mff661f7ff42cec53�[0m �[35m@astrojs/markdown-remark:build: �[0mcache hit, suppressing output �[2m7b4fcfadb8d6cc95�[0m �[32mastro:build: �[0mcache miss, executing �[2me3d8288a5596645c�[0m �[32mastro:build: �[0m �[32mastro:build: �[0m> astro@0.0.0-simple-nested-hydration-20230612101258 build /home/runner/work/astro/astro/packages/astro �[32mastro:build: �[0m> pnpm run prebuild && astro-scripts build "src/**/*.{ts,js}" && tsc && pnpm run postbuild �[32mastro:build: �[0m �[32mastro:build: �[0m �[32mastro:build: �[0m> astro@0.0.0-simple-nested-hydration-20230612101258 prebuild /home/runner/work/astro/astro/packages/astro �[32mastro:build: �[0m> astro-scripts prebuild --to-string "src/runtime/server/astro-island.ts" "src/runtime/client/{idle,load,media,only,visible}.ts" �[32mastro:build: �[0m �[32mastro:build: �[0m �[32mastro:build: �[0m> astro@0.0.0-simple-nested-hydration-20230612101258 postbuild /home/runner/work/astro/astro/packages/astro �[32mastro:build: �[0m> astro-scripts copy "src/**/*.astro" && astro-scripts copy "src/**/*.wasm" �[32mastro:build: �[0m �[35m@astrojs/mdx:build: �[0mcache miss, executing �[2m3ca99692e119bd83�[0m �[32m@astrojs/preact:build: �[0mcache miss, executing �[2m5c20ef0fc9fad850�[0m �[36m@astrojs/tailwind:build: �[0mcache miss, executing �[2m22f66561ebe7e5b6�[0m �[34m@astrojs/lit:build: �[0mcache miss, executing �[2mfb9bd9409fe75f65�[0m �[36m@astrojs/alpinejs:build: �[0mcache miss, executing �[2m814048ac8f69d1f1�[0m �[33m@astrojs/vercel:build: �[0mcache miss, executing �[2m3025bb3175c43e96�[0m �[33m@astrojs/react:build: �[0mcache miss, executing �[2m1241cc7a52d67b5f�[0m �[35m@astrojs/underscore-redirects:build: �[0mcache miss, executing �[2mb98e995c62e3da8c�[0m �[34m@astrojs/solid-js:build: �[0mcache miss, executing �[2m53e9026d8eba9ca9�[0m �[32m@astrojs/rss:build: �[0mcache miss, executing �[2m05d76a1edbd53146�[0m �[32m@astrojs/preact:build: �[0m �[32m@astrojs/preact:build: �[0m> @astrojs/preact@2.2.1 build /home/runner/work/astro/astro/packages/integrations/preact �[32m@astrojs/preact:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[32m@astrojs/preact:build: �[0m �[33m@astrojs/react:build: �[0m �[33m@astrojs/react:build: �[0m> @astrojs/react@2.2.1 build /home/runner/work/astro/astro/packages/integrations/react �[33m@astrojs/react:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[33m@astrojs/react:build: �[0m �[36m@astrojs/tailwind:build: �[0m �[36m@astrojs/tailwind:build: �[0m> @astrojs/tailwind@3.1.3 build /home/runner/work/astro/astro/packages/integrations/tailwind �[36m@astrojs/tailwind:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[36m@astrojs/tailwind:build: �[0m �[36m@astrojs/alpinejs:build: �[0m �[36m@astrojs/alpinejs:build: �[0m> @astrojs/alpinejs@0.2.2 build /home/runner/work/astro/astro/packages/integrations/alpinejs �[36m@astrojs/alpinejs:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[36m@astrojs/alpinejs:build: �[0m �[35m@astrojs/mdx:build: �[0m �[35m@astrojs/mdx:build: �[0m> @astrojs/mdx@0.19.7 build /home/runner/work/astro/astro/packages/integrations/mdx �[35m@astrojs/mdx:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[35m@astrojs/mdx:build: �[0m �[35m@astrojs/underscore-redirects:build: �[0m �[35m@astrojs/underscore-redirects:build: �[0m> @astrojs/underscore-redirects@0.1.0 build /home/runner/work/astro/astro/packages/underscore-redirects �[35m@astrojs/underscore-redirects:build: �[0m> astro-scripts build "src/**/*.ts" && tsc -p tsconfig.json �[35m@astrojs/underscore-redirects:build: �[0m �[33m@astrojs/vercel:build: �[0m �[33m@astrojs/vercel:build: �[0m> @astrojs/vercel@3.5.0 build /home/runner/work/astro/astro/packages/integrations/vercel �[33m@astrojs/vercel:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[33m@astrojs/vercel:build: �[0m �[34m@astrojs/solid-js:build: �[0m �[34m@astrojs/solid-js:build: �[0m> @astrojs/solid-js@2.2.0 build /home/runner/work/astro/astro/packages/integrations/solid �[34m@astrojs/solid-js:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[34m@astrojs/solid-js:build: �[0m �[34m@astrojs/lit:build: �[0m �[34m@astrojs/lit:build: �[0m> @astrojs/lit@2.0.2 build /home/runner/work/astro/astro/packages/integrations/lit �[34m@astrojs/lit:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[34m@astrojs/lit:build: �[0m �[32m@astrojs/rss:build: �[0m �[32m@astrojs/rss:build: �[0m> @astrojs/rss@2.4.3 build /home/runner/work/astro/astro/packages/astro-rss �[32m@astrojs/rss:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[32m@astrojs/rss:build: �[0m �[33m@astrojs/node:build: �[0mcache miss, executing �[2mb97b7ca3b308819a�[0m �[34m@astrojs/image:build: �[0mcache miss, executing �[2m973a5ed2a28b66a9�[0m �[36m@astrojs/vue:build: �[0mcache miss, executing �[2m5fd281adff5c0d17�[0m �[35m@astrojs/deno:build: �[0mcache miss, executing �[2m04d532cb698e536f�[0m �[32m@astrojs/turbolinks:build: �[0mcache miss, executing �[2mba2e24b4bf33e914�[0m �[33m@astrojs/prefetch:build: �[0mcache miss, executing �[2m7fd32900c429fb3b�[0m �[34m@astrojs/partytown:build: �[0mcache miss, executing �[2m113216e76e81402f�[0m �[36m@astrojs/markdoc:build: �[0mcache miss, executing �[2m8c90409dae3a2339�[0m �[35m@astrojs/svelte:build: �[0mcache miss, executing �[2md4609d956eb352d1�[0m �[33m@astrojs/node:build: �[0m �[33m@astrojs/node:build: �[0m> @astrojs/node@5.2.0 build /home/runner/work/astro/astro/packages/integrations/node �[33m@astrojs/node:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[33m@astrojs/node:build: �[0m �[34m@astrojs/image:build: �[0m �[34m@astrojs/image:build: �[0m> @astrojs/image@0.17.0 build /home/runner/work/astro/astro/packages/integrations/image �[34m@astrojs/image:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[34m@astrojs/image:build: �[0m �[36m@astrojs/vue:build: �[0m �[36m@astrojs/vue:build: �[0m> @astrojs/vue@2.2.1 build /home/runner/work/astro/astro/packages/integrations/vue �[36m@astrojs/vue:build: �[0m> astro-scripts build "src/index.ts" && astro-scripts build "src/editor.cts" --force-cjs --no-clean-dist && tsc �[36m@astrojs/vue:build: �[0m �[35m@astrojs/deno:build: �[0m �[35m@astrojs/deno:build: �[0m> @astrojs/deno@4.1.1 build /home/runner/work/astro/astro/packages/integrations/deno �[35m@astrojs/deno:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[35m@astrojs/deno:build: �[0m �[32m@benchmark/timer:build: �[0mcache miss, executing �[2ma4734cd450f5cb27�[0m �[32m@astrojs/turbolinks:build: �[0m �[32m@astrojs/turbolinks:build: �[0m> @astrojs/turbolinks@0.2.2 build /home/runner/work/astro/astro/packages/integrations/turbolinks �[32m@astrojs/turbolinks:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[32m@astrojs/turbolinks:build: �[0m �[33m@astrojs/prefetch:build: �[0m �[33m@astrojs/prefetch:build: �[0m> @astrojs/prefetch@0.2.3 build /home/runner/work/astro/astro/packages/integrations/prefetch �[33m@astrojs/prefetch:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[33m@astrojs/prefetch:build: �[0m �[34m@astrojs/partytown:build: �[0m �[34m@astrojs/partytown:build: �[0m> @astrojs/partytown@1.2.3 build /home/runner/work/astro/astro/packages/integrations/partytown �[34m@astrojs/partytown:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[34m@astrojs/partytown:build: �[0m �[36m@astrojs/markdoc:build: �[0m �[36m@astrojs/markdoc:build: �[0m> @astrojs/markdoc@0.3.3 build /home/runner/work/astro/astro/packages/integrations/markdoc �[36m@astrojs/markdoc:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[36m@astrojs/markdoc:build: �[0m �[35m@astrojs/svelte:build: �[0m �[35m@astrojs/svelte:build: �[0m> @astrojs/svelte@3.0.0 build /home/runner/work/astro/astro/packages/integrations/svelte �[35m@astrojs/svelte:build: �[0m> astro-scripts build "src/index.ts" && astro-scripts build "src/editor.cts" --force-cjs --no-clean-dist && tsc �[35m@astrojs/svelte:build: �[0m �[32m@benchmark/timer:build: �[0m �[32m@benchmark/timer:build: �[0m> @benchmark/timer@0.0.0 build /home/runner/work/astro/astro/benchmark/packages/timer �[32m@benchmark/timer:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[32m@benchmark/timer:build: �[0m �[33m@astrojs/netlify:build: �[0mcache miss, executing �[2m05ac04e6966ddd4f�[0m �[34m@astrojs/cloudflare:build: �[0mcache miss, executing �[2m488b36774d80415f�[0m �[36m@astrojs/sitemap:build: �[0mcache miss, executing �[2mec35186cd99464c7�[0m �[33m@astrojs/netlify:build: �[0m �[33m@astrojs/netlify:build: �[0m> @astrojs/netlify@2.3.0 build /home/runner/work/astro/astro/packages/integrations/netlify �[33m@astrojs/netlify:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[33m@astrojs/netlify:build: �[0m �[34m@astrojs/cloudflare:build: �[0m �[34m@astrojs/cloudflare:build: �[0m> @astrojs/cloudflare@6.4.0 build /home/runner/work/astro/astro/packages/integrations/cloudflare �[34m@astrojs/cloudflare:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[34m@astrojs/cloudflare:build: �[0m �[36m@astrojs/sitemap:build: �[0m �[36m@astrojs/sitemap:build: �[0m> @astrojs/sitemap@1.3.3 build /home/runner/work/astro/astro/packages/integrations/sitemap �[36m@astrojs/sitemap:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[36m@astrojs/sitemap:build: �[0m Tasks: 30 successful, 30 total Cached: 6 cached, 30 total Time: 1m11.342s 🦋 �[33mwarn�[39m �[31m===============================IMPORTANT!===============================�[39m 🦋 �[33mwarn�[39m Packages will be released under the next--simple-nested-hydration tag 🦋 �[33mwarn�[39m �[31m----------------------------------------------------------------------�[39m 🦋 �[36minfo�[39m npm info astro 🦋 �[36minfo�[39m npm info @astrojs/prism 🦋 �[36minfo�[39m npm info @astrojs/rss 🦋 �[36minfo�[39m npm info create-astro 🦋 �[36minfo�[39m npm info @astrojs/alpinejs 🦋 �[36minfo�[39m npm info @astrojs/cloudflare 🦋 �[36minfo�[39m npm info @astrojs/deno 🦋 �[36minfo�[39m npm info @astrojs/image 🦋 �[36minfo�[39m npm info @astrojs/lit 🦋 �[36minfo�[39m npm info @astrojs/markdoc 🦋 �[36minfo�[39m npm info @astrojs/mdx 🦋 �[36minfo�[39m npm info @astrojs/netlify 🦋 �[36minfo�[39m npm info @astrojs/node 🦋 �[36minfo�[39m npm info @astrojs/partytown 🦋 �[36minfo�[39m npm info @astrojs/preact 🦋 �[36minfo�[39m npm info @astrojs/prefetch 🦋 �[36minfo�[39m npm info @astrojs/react 🦋 �[36minfo�[39m npm info @astrojs/sitemap 🦋 �[36minfo�[39m npm info @astrojs/solid-js 🦋 �[36minfo�[39m npm info @astrojs/svelte 🦋 �[36minfo�[39m npm info @astrojs/tailwind 🦋 �[36minfo�[39m npm info @astrojs/turbolinks 🦋 �[36minfo�[39m npm info @astrojs/vercel 🦋 �[36minfo�[39m npm info @astrojs/vue 🦋 �[36minfo�[39m npm info @astrojs/internal-helpers 🦋 �[36minfo�[39m npm info @astrojs/markdown-component 🦋 �[36minfo�[39m npm info @astrojs/markdown-remark 🦋 �[36minfo�[39m npm info @astrojs/telemetry 🦋 �[36minfo�[39m npm info @astrojs/underscore-redirects 🦋 �[36minfo�[39m npm info @astrojs/webapi 🦋 �[36minfo�[39m astro is being published because our local version (0.0.0-simple-nested-hydration-20230612101258) has not been published on npm 🦋 �[33mwarn�[39m @astrojs/prism is not being published because version 2.1.2 is already published on npm 🦋 �[33mwarn�[39m @astrojs/rss is not being published because version 2.4.3 is already published on npm 🦋 �[33mwarn�[39m create-astro is not being published because version 3.1.7 is already published on npm 🦋 �[33mwarn�[39m @astrojs/alpinejs is not being published because version 0.2.2 is already published on npm 🦋 �[33mwarn�[39m @astrojs/cloudflare is not being published because version 6.4.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/deno is not being published because version 4.1.1 is already published on npm 🦋 �[33mwarn�[39m @astrojs/image is not being published because version 0.17.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/lit is not being published because version 2.0.2 is already published on npm 🦋 �[33mwarn�[39m @astrojs/markdoc is not being published because version 0.3.3 is already published on npm 🦋 �[33mwarn�[39m @astrojs/mdx is not being published because version 0.19.7 is already published on npm 🦋 �[33mwarn�[39m @astrojs/netlify is not being published because version 2.3.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/node is not being published because version 5.2.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/partytown is not being published because version 1.2.3 is already published on npm 🦋 �[33mwarn�[39m @astrojs/preact is not being published because version 2.2.1 is already published on npm 🦋 �[33mwarn�[39m @astrojs/prefetch is not being published because version 0.2.3 is already published on npm 🦋 �[33mwarn�[39m @astrojs/react is not being published because version 2.2.1 is already published on npm 🦋 �[33mwarn�[39m @astrojs/sitemap is not being published because version 1.3.3 is already published on npm 🦋 �[33mwarn�[39m @astrojs/solid-js is not being published because version 2.2.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/svelte is not being published because version 3.0.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/tailwind is not being published because version 3.1.3 is already published on npm 🦋 �[33mwarn�[39m @astrojs/turbolinks is not being published because version 0.2.2 is already published on npm 🦋 �[33mwarn�[39m @astrojs/vercel is not being published because version 3.5.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/vue is not being published because version 2.2.1 is already published on npm 🦋 �[33mwarn�[39m @astrojs/internal-helpers is not being published because version 0.1.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/markdown-component is not being published because version 1.0.5 is already published on npm 🦋 �[33mwarn�[39m @astrojs/markdown-remark is not being published because version 2.2.1 is already published on npm 🦋 �[33mwarn�[39m @astrojs/telemetry is not being published because version 2.1.1 is already published on npm 🦋 �[33mwarn�[39m @astrojs/underscore-redirects is not being published because version 0.1.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/webapi is not being published because version 2.2.0 is already published on npm 🦋 �[36minfo�[39m Publishing �[36m"astro"�[39m at �[32m"0.0.0-simple-nested-hydration-20230612101258"�[39m 🦋 �[32msuccess�[39m packages published successfully: 🦋 astro@0.0.0-simple-nested-hydration-20230612101258 🦋 Creating git tag... 🦋 New tag: astro@0.0.0-simple-nested-hydration-20230612101258