diff --git a/.changeset/dirty-donkeys-return.md b/.changeset/dirty-donkeys-return.md
deleted file mode 100644
index 9efdef3f08..0000000000
--- a/.changeset/dirty-donkeys-return.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@shopify/hydrogen': patch
----
-
-Client components no longer need to use `@shopify/hydrogen/client` as the import path. All Hydrogen components can now be imported from `@shopify/hydrogen` regardless of their context.
diff --git a/.changeset/flat-flies-relate.md b/.changeset/flat-flies-relate.md
deleted file mode 100644
index 273ef58f8c..0000000000
--- a/.changeset/flat-flies-relate.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-'@shopify/hydrogen': patch
----
-
-You can now easily disable streaming on any page conditionally with the `enableStreaming` option inside `hydrogen.config.js`:
-
-```ts
-import {CookieSessionStorage} from '@shopify/hydrogen';
-import {defineConfig} from '@shopify/hydrogen/config';
-
-export default defineConfig({
- routes: import.meta.globEager('./src/routes/**/*.server.[jt](s|sx)'),
- shopify: {
- defaultLocale: 'en-us',
- storeDomain: 'hydrogen-preview.myshopify.com',
- storefrontToken: '3b580e70970c4528da70c98e097c2fa0',
- storefrontApiVersion: '2022-07',
- },
- enableStreaming: (req) => req.headers.get('user-agent') !== 'custom bot',
-});
-```
-
-By default all pages are stream rendered except for SEO bots. There shouldn't be many reasons to disable streaming, unless there is a custom bot not covered by Hydrogen's bot detection.
diff --git a/.changeset/fluffy-oranges-dress.md b/.changeset/fluffy-oranges-dress.md
deleted file mode 100644
index ad5e454e5c..0000000000
--- a/.changeset/fluffy-oranges-dress.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-'@shopify/hydrogen': minor
----
-
-**Breaking Change**: `` updates and `` Removed.
-
-- `` has been removed
-- `` has two new props: `measurement` and `measurementSeparator` which do the work that `UnitPrice` used to do
-- The TypeScript types for `` have been improved and should provide a better typed experience now
diff --git a/.changeset/four-bags-judge.md b/.changeset/four-bags-judge.md
deleted file mode 100644
index b9a3eec2aa..0000000000
--- a/.changeset/four-bags-judge.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@shopify/hydrogen': minor
----
-
-Fixes an issue where cached sub-requests were not revalidating properly.
diff --git a/.changeset/friendly-ravens-wash.md b/.changeset/friendly-ravens-wash.md
deleted file mode 100644
index 7f8d436778..0000000000
--- a/.changeset/friendly-ravens-wash.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@shopify/hydrogen': patch
----
-
-Buffer RSC flight responses. There isn't any benefit to streaming them, because we start a transition on page navigation. Buffering also fixes caching problems on the flight response.
diff --git a/.changeset/moody-planes-perform.md b/.changeset/moody-planes-perform.md
deleted file mode 100644
index 8737422a19..0000000000
--- a/.changeset/moody-planes-perform.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@shopify/hydrogen': patch
----
-
-Reverts [#1272](https://github.com/Shopify/hydrogen/pull/1272) and properly escapes terminating script sequences
diff --git a/.changeset/odd-mails-yawn.md b/.changeset/odd-mails-yawn.md
deleted file mode 100644
index d6e09e43e6..0000000000
--- a/.changeset/odd-mails-yawn.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-'@shopify/hydrogen': patch
----
-
-Hydrogen has been updated to use the latest stable version of React.
-
-To update an existing Hydrogen app:
-
-```bash
-yarn add react@latest react-dom@latest
-```
diff --git a/.changeset/smart-maps-taste.md b/.changeset/smart-maps-taste.md
deleted file mode 100644
index 6ce6136e49..0000000000
--- a/.changeset/smart-maps-taste.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@shopify/hydrogen': minor
----
-
-Removed `` and `` components. To migrate, use `{product.title}` and `{product.description}` instead.
diff --git a/.changeset/unlucky-books-yell.md b/.changeset/unlucky-books-yell.md
deleted file mode 100644
index fe48764714..0000000000
--- a/.changeset/unlucky-books-yell.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@shopify/hydrogen': minor
----
-
-**Breaking Change**
-
-The `` component has been removed. Instead, directly use the `` component.
diff --git a/packages/create-hydrogen-app/CHANGELOG.md b/packages/create-hydrogen-app/CHANGELOG.md
index 97d439bc75..0cc89a6d33 100644
--- a/packages/create-hydrogen-app/CHANGELOG.md
+++ b/packages/create-hydrogen-app/CHANGELOG.md
@@ -1,5 +1,7 @@
# Changelog
+## 0.21.0
+
## 0.20.0
## 0.19.0
diff --git a/packages/create-hydrogen-app/package.json b/packages/create-hydrogen-app/package.json
index 0abfff3e7c..52d5ad7504 100644
--- a/packages/create-hydrogen-app/package.json
+++ b/packages/create-hydrogen-app/package.json
@@ -4,7 +4,7 @@
"access": "public",
"@shopify:registry": "https://registry.npmjs.org"
},
- "version": "0.20.0",
+ "version": "0.21.0",
"main": "index.js",
"license": "MIT",
"bin": {
diff --git a/packages/hydrogen/CHANGELOG.md b/packages/hydrogen/CHANGELOG.md
index 1e2bc47cfb..9af53a0d50 100644
--- a/packages/hydrogen/CHANGELOG.md
+++ b/packages/hydrogen/CHANGELOG.md
@@ -1,5 +1,59 @@
# Changelog
+## 0.21.0
+
+### Minor Changes
+
+- [#1327](https://github.com/Shopify/hydrogen/pull/1327) [`ce56311f`](https://github.com/Shopify/hydrogen/commit/ce56311fc1b63df22f77b199980439548f76997a) Thanks [@frehner](https://github.com/frehner)! - **Breaking Change**: `` updates and `` Removed.
+
+ - `` has been removed
+ - `` has two new props: `measurement` and `measurementSeparator` which do the work that `UnitPrice` used to do
+ - The TypeScript types for `` have been improved and should provide a better typed experience now
+
+* [#1216](https://github.com/Shopify/hydrogen/pull/1216) [`771786a6`](https://github.com/Shopify/hydrogen/commit/771786a6475c4caadb1abe5f6644e2b5c2abc021) Thanks [@wizardlyhel](https://github.com/wizardlyhel)! - Fixes an issue where cached sub-requests were not revalidating properly.
+
+- [#1304](https://github.com/Shopify/hydrogen/pull/1304) [`aa196150`](https://github.com/Shopify/hydrogen/commit/aa19615024de4fe16d548429665a863e9aae0248) Thanks [@frehner](https://github.com/frehner)! - Removed `` and `` components. To migrate, use `{product.title}` and `{product.description}` instead.
+
+* [#1335](https://github.com/Shopify/hydrogen/pull/1335) [`0d90f92b`](https://github.com/Shopify/hydrogen/commit/0d90f92b448b0c4d99be3e5f5fa25d0b70a8315e) Thanks [@blittle](https://github.com/blittle)! - **Breaking Change**
+
+ The `` component has been removed. Instead, directly use the `` component.
+
+### Patch Changes
+
+- [#1311](https://github.com/Shopify/hydrogen/pull/1311) [`3e3fd72f`](https://github.com/Shopify/hydrogen/commit/3e3fd72f7016c0993deceefc121306cf957ef564) Thanks [@jplhomer](https://github.com/jplhomer)! - Client components no longer need to use `@shopify/hydrogen/client` as the import path. All Hydrogen components can now be imported from `@shopify/hydrogen` regardless of their context.
+
+* [#1259](https://github.com/Shopify/hydrogen/pull/1259) [`110e9aca`](https://github.com/Shopify/hydrogen/commit/110e9aca385d553e3a87fea406f8bd8a43a0788f) Thanks [@blittle](https://github.com/blittle)! - You can now easily disable streaming on any page conditionally with the `enableStreaming` option inside `hydrogen.config.js`:
+
+ ```ts
+ import {CookieSessionStorage} from '@shopify/hydrogen';
+ import {defineConfig} from '@shopify/hydrogen/config';
+
+ export default defineConfig({
+ routes: import.meta.globEager('./src/routes/**/*.server.[jt](s|sx)'),
+ shopify: {
+ defaultLocale: 'en-us',
+ storeDomain: 'hydrogen-preview.myshopify.com',
+ storefrontToken: '3b580e70970c4528da70c98e097c2fa0',
+ storefrontApiVersion: '2022-07',
+ },
+ enableStreaming: (req) => req.headers.get('user-agent') !== 'custom bot',
+ });
+ ```
+
+ By default all pages are stream rendered except for SEO bots. There shouldn't be many reasons to disable streaming, unless there is a custom bot not covered by Hydrogen's bot detection.
+
+- [#1318](https://github.com/Shopify/hydrogen/pull/1318) [`668a24da`](https://github.com/Shopify/hydrogen/commit/668a24daebf180747a002c8020c2e712f5d9a458) Thanks [@blittle](https://github.com/blittle)! - Buffer RSC flight responses. There isn't any benefit to streaming them, because we start a transition on page navigation. Buffering also fixes caching problems on the flight response.
+
+* [#1293](https://github.com/Shopify/hydrogen/pull/1293) [`e378ed61`](https://github.com/Shopify/hydrogen/commit/e378ed6199553f64d9e73ad27f9409ef501aa724) Thanks [@jplhomer](https://github.com/jplhomer)! - Reverts [#1272](https://github.com/Shopify/hydrogen/pull/1272) and properly escapes terminating script sequences
+
+- [#1283](https://github.com/Shopify/hydrogen/pull/1283) [`eea82cb0`](https://github.com/Shopify/hydrogen/commit/eea82cb02064471d274e534c557caa5d3527bc93) Thanks [@jplhomer](https://github.com/jplhomer)! - Hydrogen has been updated to use the latest stable version of React.
+
+ To update an existing Hydrogen app:
+
+ ```bash
+ yarn add react@latest react-dom@latest
+ ```
+
## 0.20.0
### Minor Changes
diff --git a/packages/hydrogen/package.json b/packages/hydrogen/package.json
index 3a9c11810b..8fc4a5ee4d 100644
--- a/packages/hydrogen/package.json
+++ b/packages/hydrogen/package.json
@@ -7,7 +7,7 @@
"engines": {
"node": ">=14"
},
- "version": "0.20.0",
+ "version": "0.21.0",
"description": "Modern custom Shopify storefronts",
"license": "MIT",
"main": "dist/esnext/index.js",
diff --git a/packages/hydrogen/src/version.ts b/packages/hydrogen/src/version.ts
index b429262189..699430c5c8 100644
--- a/packages/hydrogen/src/version.ts
+++ b/packages/hydrogen/src/version.ts
@@ -1 +1 @@
-export const LIB_VERSION = '0.20.0';
+export const LIB_VERSION = '0.21.0';
diff --git a/packages/playground/async-config/package.json b/packages/playground/async-config/package.json
index 401bf29466..f35a1ceb45 100644
--- a/packages/playground/async-config/package.json
+++ b/packages/playground/async-config/package.json
@@ -17,7 +17,7 @@
},
"dependencies": {
"@cloudflare/kv-asset-handler": "*",
- "@shopify/hydrogen": "^0.20.0",
+ "@shopify/hydrogen": "^0.21.0",
"miniflare": "^1.3.3",
"react": "^18.1.0",
"react-dom": "^18.1.0"
diff --git a/packages/playground/server-components/package.json b/packages/playground/server-components/package.json
index d8f05e8612..1a037add67 100644
--- a/packages/playground/server-components/package.json
+++ b/packages/playground/server-components/package.json
@@ -17,7 +17,7 @@
},
"dependencies": {
"@cloudflare/kv-asset-handler": "*",
- "@shopify/hydrogen": "^0.20.0",
+ "@shopify/hydrogen": "^0.21.0",
"miniflare": "^1.3.3",
"react": "^18.1.0",
"react-dom": "^18.1.0"
diff --git a/templates/template-hydrogen-default/package.json b/templates/template-hydrogen-default/package.json
index 46a5d5f0dd..946617e45d 100644
--- a/templates/template-hydrogen-default/package.json
+++ b/templates/template-hydrogen-default/package.json
@@ -40,7 +40,7 @@
},
"dependencies": {
"@headlessui/react": "^1.5.0",
- "@shopify/hydrogen": "^0.20.0",
+ "@shopify/hydrogen": "^0.21.0",
"body-parser": "^1.20.0",
"compression": "^1.7.4",
"graphql-tag": "^2.12.4",
diff --git a/templates/template-hydrogen-hello-world/package.json b/templates/template-hydrogen-hello-world/package.json
index 36aa9f4733..1ed4621d47 100644
--- a/templates/template-hydrogen-hello-world/package.json
+++ b/templates/template-hydrogen-hello-world/package.json
@@ -15,7 +15,7 @@
"vite": "^2.9.0"
},
"dependencies": {
- "@shopify/hydrogen": "^0.20.0",
+ "@shopify/hydrogen": "^0.21.0",
"react": "^18.1.0",
"react-dom": "^18.1.0"
}