diff --git a/.changeset/brown-toys-juggle.md b/.changeset/brown-toys-juggle.md
deleted file mode 100644
index 2472947404..0000000000
--- a/.changeset/brown-toys-juggle.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sitecore-content-sdk/nextjs': minor
----
-
-[nextjs] Add context to nextjs proxies that the developers can use to get information an what was executed inside each proxy
diff --git a/.changeset/cleanup-package-json-config.md b/.changeset/cleanup-package-json-config.md
deleted file mode 100644
index 9b47720dc3..0000000000
--- a/.changeset/cleanup-package-json-config.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'create-content-sdk-app': patch
----
-
-Remove unused config section from nextjs template package.json to eliminate npm warnings about unknown CLI config settings.
diff --git a/.changeset/create-content-sdk-app-help.md b/.changeset/create-content-sdk-app-help.md
deleted file mode 100644
index 5b214c8063..0000000000
--- a/.changeset/create-content-sdk-app-help.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'create-content-sdk-app': patch
----
-
-[create-content-sdk-app] Add help flag output
diff --git a/.changeset/curvy-berries-sin.md b/.changeset/curvy-berries-sin.md
deleted file mode 100644
index 10951669c0..0000000000
--- a/.changeset/curvy-berries-sin.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sitecore-content-sdk/content': patch
----
-
-Personalize hide component does not work properly in edit in case of nested personalization
diff --git a/.changeset/fast-mice-trade.md b/.changeset/fast-mice-trade.md
deleted file mode 100644
index c24344d64b..0000000000
--- a/.changeset/fast-mice-trade.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sitecore-content-sdk/nextjs': patch
----
-
-[nextjs][Fix] Correct redirect-map regex matching and capture replacement for anchored patterns, locale-prefixed paths, and root-path redirects.
diff --git a/.changeset/fix-cache-components-404-fetching.md b/.changeset/fix-cache-components-404-fetching.md
deleted file mode 100644
index ba0347b73f..0000000000
--- a/.changeset/fix-cache-components-404-fetching.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'create-content-sdk-app': patch
----
-
-[create-content-sdk-app] Fix custom 404 handling in cache-components template
\ No newline at end of file
diff --git a/.changeset/fix-preview-context-imageparams.md b/.changeset/fix-preview-context-imageparams.md
deleted file mode 100644
index 749e067492..0000000000
--- a/.changeset/fix-preview-context-imageparams.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sitecore-content-sdk/content': patch
----
-
-Fix imageParams breaking preview context images. Preview authentication parameters (ttc, tt, hash) were being stripped when imageParams were applied, causing images to fail loading. These parameters are now preserved in the required params list.
diff --git a/.changeset/fix-tailwind-monorepo-source-scan.md b/.changeset/fix-tailwind-monorepo-source-scan.md
deleted file mode 100644
index a6c591e70e..0000000000
--- a/.changeset/fix-tailwind-monorepo-source-scan.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'create-content-sdk-app': patch
----
-
-Scope Tailwind v4 source scanning to app `src` in App Router templates so monorepo `yarn watch` samples do not hang or fail on `globals.css` when symlinked SDK packages are scanned.
diff --git a/.changeset/forty-planets-thank.md b/.changeset/forty-planets-thank.md
deleted file mode 100644
index 0b1c67ed0a..0000000000
--- a/.changeset/forty-planets-thank.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sitecore-content-sdk/content': patch
----
-
-[content] Fix fallback URL in Sitemapindex
diff --git a/.changeset/frank-rats-tap.md b/.changeset/frank-rats-tap.md
deleted file mode 100644
index 3eb8b237ab..0000000000
--- a/.changeset/frank-rats-tap.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@sitecore-content-sdk/content': minor
-'@sitecore-content-sdk/nextjs': minor
----
-
-Support Draft Components
diff --git a/.changeset/gentle-rocks-clean.md b/.changeset/gentle-rocks-clean.md
deleted file mode 100644
index 2cd99c3318..0000000000
--- a/.changeset/gentle-rocks-clean.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sitecore-content-sdk/nextjs': minor
----
-
-[nextjs] Fix sitemap route validation to return undefined for sitemap-index path.
diff --git a/.changeset/hot-tires-tell.md b/.changeset/hot-tires-tell.md
deleted file mode 100644
index 994e09d5eb..0000000000
--- a/.changeset/hot-tires-tell.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@sitecore-content-sdk/nextjs': minor
-'@sitecore-content-sdk/react': minor
----
-
-[nextjs][react] Add renderChildrenWhenEmpty prop to Link component to render empty anchor with children instead of null when the link field value is empty.
diff --git a/.changeset/khaki-dragons-fold.md b/.changeset/khaki-dragons-fold.md
deleted file mode 100644
index af5f5f359a..0000000000
--- a/.changeset/khaki-dragons-fold.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@sitecore-content-sdk/core': patch
-'@sitecore-content-sdk/content': patch
----
-
-[core][content] Replace `url-parse` with the WHATWG `URL` API in the GraphQL client and media URL helpers to avoid Node `DEP0169` / legacy URL parsing warnings.
diff --git a/.changeset/modern-impalas-write.md b/.changeset/modern-impalas-write.md
deleted file mode 100644
index 56cb5a4543..0000000000
--- a/.changeset/modern-impalas-write.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sitecore-content-sdk/nextjs': patch
----
-
-500 Internal Server Error occurs in Pages editor when Server error page is opened
diff --git a/.changeset/non-string-styles-params.md b/.changeset/non-string-styles-params.md
deleted file mode 100644
index 1eab424281..0000000000
--- a/.changeset/non-string-styles-params.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sitecore-content-sdk/content': patch
----
-
-[content] Fix build crash and normalize DetailedRenderingParams object values for `Styles`, `CSSStyles`, `LibraryId`, and `GridParameters` rendering params
diff --git a/.changeset/partial-design-placeholder-templates.md b/.changeset/partial-design-placeholder-templates.md
deleted file mode 100644
index 42cc5c9f9d..0000000000
--- a/.changeset/partial-design-placeholder-templates.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'create-content-sdk-app': patch
----
-
-[create-content-sdk-app] Add PartialDesignDynamicPlaceholder to App Router and Pages Router templates for Sitecore AI partial designs
diff --git a/.changeset/perky-bushes-listen.md b/.changeset/perky-bushes-listen.md
deleted file mode 100644
index 5b3c234682..0000000000
--- a/.changeset/perky-bushes-listen.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'create-content-sdk-app': patch
----
-
-[create-content-sdk][Chore] The template version management has been adjusted for multi-version use
diff --git a/.changeset/perky-rocks-mix.md b/.changeset/perky-rocks-mix.md
deleted file mode 100644
index 1ac65833db..0000000000
--- a/.changeset/perky-rocks-mix.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sitecore-content-sdk/nextjs': patch
----
-
-BYOC and FEAAS are broken when client component map generation is disabled
diff --git a/.changeset/remove-sync-disk-cache.md b/.changeset/remove-sync-disk-cache.md
deleted file mode 100644
index e7d8cc9025..0000000000
--- a/.changeset/remove-sync-disk-cache.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sitecore-content-sdk/nextjs': patch
----
-
-Remove unused sync-disk-cache dependency which was unmaintained and had security warnings. The package was declared but never actually imported or used in the codebase.
diff --git a/.changeset/remove-template-from-help-options.md b/.changeset/remove-template-from-help-options.md
deleted file mode 100644
index ff2cb9a67e..0000000000
--- a/.changeset/remove-template-from-help-options.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'create-content-sdk-app': patch
----
-
-[create-content-sdk-app] Remove redundant --template from help options
diff --git a/.changeset/seven-chicken-laugh.md b/.changeset/seven-chicken-laugh.md
deleted file mode 100644
index 917ba69ca5..0000000000
--- a/.changeset/seven-chicken-laugh.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sitecore-content-sdk/nextjs': patch
----
-
-[Pages Router] Set auth token in proxy and api route for preview protection
diff --git a/.changeset/seven-ghosts-arrive.md b/.changeset/seven-ghosts-arrive.md
deleted file mode 100644
index ee7f39eda3..0000000000
--- a/.changeset/seven-ghosts-arrive.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@sitecore-content-sdk/content': patch
-'@sitecore-content-sdk/nextjs': patch
----
-
-Fix personalization resolution in Edit Mode and Preview Mode by sending the `sc_variant` header to the Preview GraphQL API so API resolves the active variant server-side, instead of relying on sdk `experiences` filtering.
diff --git a/.changeset/slow-lamps-learn.md b/.changeset/slow-lamps-learn.md
deleted file mode 100644
index cb74a96bca..0000000000
--- a/.changeset/slow-lamps-learn.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-"@sitecore-content-sdk/nextjs": minor
-"create-content-sdk-app": minor
----
-
-Add tag-based revalidation support for the Next.js App Router with Cache Components, including cache tag helpers and revalidation route handlers.
-
-Introduce the `nextjs-app-router-cache-components` scaffolding template with a combined revalidation route wired out of the box.
diff --git a/.changeset/sour-onions-drop.md b/.changeset/sour-onions-drop.md
deleted file mode 100644
index 39a5810673..0000000000
--- a/.changeset/sour-onions-drop.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'create-content-sdk-app': minor
-'@sitecore-content-sdk/cli': minor
----
-
-[cli][create-content-sdk-app] Update build and component map generation to recreate the .sitecore directory when it is missing.
diff --git a/.changeset/sweet-crews-live.md b/.changeset/sweet-crews-live.md
deleted file mode 100644
index de615b68e8..0000000000
--- a/.changeset/sweet-crews-live.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sitecore-content-sdk/nextjs': patch
----
-
-Fallback of clientComponentMap option in defineCliConfig reverted to be true
diff --git a/.changeset/thirty-hats-smoke.md b/.changeset/thirty-hats-smoke.md
deleted file mode 100644
index 1c62ea81d0..0000000000
--- a/.changeset/thirty-hats-smoke.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sitecore-content-sdk/nextjs': patch
----
-
-Pass sc_previewMode, sc_site when performing authorization in PreviewProxy
diff --git a/.changeset/time-based-preview-support.md b/.changeset/time-based-preview-support.md
deleted file mode 100644
index c609492713..0000000000
--- a/.changeset/time-based-preview-support.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@sitecore-content-sdk/nextjs': patch
-'@sitecore-content-sdk/content': patch
----
-
-Support time-based preview via sc_previewTime query parameter. The editing render endpoint now accepts an optional sc_previewTime query parameter and forwards it as a header to Edge Preview GraphQL, enabling calendar-based content validation at specific future dates.
diff --git a/.changeset/upgrade-glob-to-v13.md b/.changeset/upgrade-glob-to-v13.md
deleted file mode 100644
index df168ba708..0000000000
--- a/.changeset/upgrade-glob-to-v13.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@sitecore-content-sdk/content': patch
-'@sitecore-content-sdk/nextjs': patch
-'create-content-sdk-app': patch
----
-
-Upgrade glob dependency from deprecated v11 to v13 to resolve security vulnerabilities (CVE-2025-64756)
diff --git a/.changeset/whole-falcons-shout.md b/.changeset/whole-falcons-shout.md
deleted file mode 100644
index cfca789aa1..0000000000
--- a/.changeset/whole-falcons-shout.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sitecore-content-sdk/nextjs': patch
----
-
-Check sc_site search parameter in PreviewProxy as a fallback when cookie is missing
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
new file mode 100644
index 0000000000..aa92b046ea
--- /dev/null
+++ b/packages/cli/CHANGELOG.md
@@ -0,0 +1,9 @@
+# @sitecore-content-sdk/cli
+
+## 2.2.0
+
+### Minor Changes
+
+- [cli][create-content-sdk-app] Update build and component map generation to recreate the .sitecore directory when it is missing. ([0325d61](https://github.com/sitecore/content-sdk/commit/0325d614f670aabc44a25c7deff996ace6a1fe8c))
+- minor `@sitecore-content-sdk/content` dependency update:
+  - Support Draft Components ([a1d3798](https://github.com/sitecore/content-sdk/commit/a1d379868299122f98c2bf8e4536466d377703b7))
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5b827b0641..278954b0bd 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,80 +1,80 @@
-{
-  "name": "@sitecore-content-sdk/cli",
-  "version": "2.1.0",
-  "description": "Sitecore Content SDK CLI",
-  "main": "dist/cjs/cli.js",
-  "module": "dist/esm/cli.js",
-  "sideEffects": false,
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "scripts": {
-    "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-esm.json",
-    "clean": "del-cli dist types",
-    "lint": "eslint \"./src/**/*.ts\"",
-    "sitecore-tools": "node ./dist/cjs/bin/sitecore-tools.js",
-    "test": "mocha --require ts-node/register/transpile-only \"./src/**/*.test.ts\"",
-    "coverage": "nyc --require ts-node/register/transpile-only npm test"
-  },
-  "engines": {
-    "node": ">=24"
-  },
-  "preferGlobal": true,
-  "bin": {
-    "sitecore-tools": "./dist/cjs/bin/sitecore-tools.js"
-  },
-  "author": {
-    "name": "Sitecore Corporation",
-    "url": "https://doc.sitecore.com/xmc/en/developers/content-sdk/index.html"
-  },
-  "license": "Apache-2.0",
-  "homepage": "https://doc.sitecore.com/xmc/en/developers/content-sdk/index.html",
-  "bugs": {
-    "url": "https://github.com/sitecore/content-sdk/issues"
-  },
-  "dependencies": {
-    "@sitecore-content-sdk/content": "^2.1.0",
-    "@sitecore-content-sdk/core": "^2.1.0",
-    "chokidar": "^4.0.3",
-    "dotenv": "^16.5.0",
-    "dotenv-expand": "^12.0.2",
-    "inquirer": "^12.9.6",
-    "resolve": "^1.22.10",
-    "tmp": "^0.2.3",
-    "tsx": "^4.19.4",
-    "yargs": "^17.7.2"
-  },
-  "devDependencies": {
-    "@stylistic/eslint-plugin": "^5.2.2",
-    "@types/chai": "^5.2.2",
-    "@types/inquirer": "^9.0.9",
-    "@types/mocha": "^10.0.10",
-    "@types/node": "^24.10.4",
-    "@types/resolve": "^1.20.6",
-    "@types/sinon": "^17.0.4",
-    "@types/tmp": "^0.2.6",
-    "@types/yargs": "^17.0.33",
-    "@typescript-eslint/eslint-plugin": "8.39.0",
-    "@typescript-eslint/parser": "8.39.0",
-    "chai": "^4.4.1",
-    "del-cli": "^6.0.0",
-    "eslint": "^9.32.0",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-import": "2.32.0",
-    "eslint-plugin-jsdoc": "52.0.3",
-    "eslint-plugin-prettier": "^4.0.0",
-    "mocha": "^11.2.2",
-    "nyc": "^17.1.0",
-    "prettier": "^2.8.0",
-    "proxyquire": "^2.1.3",
-    "sinon": "^20.0.0",
-    "ts-node": "^10.9.1",
-    "typescript": "~5.8.3"
-  },
-  "gitHead": "2f4820efddf4454eeee58ed1b2cc251969efdf5b",
-  "files": [
-    "dist",
-    "types"
-  ]
-}
+{
+  "name": "@sitecore-content-sdk/cli",
+  "version": "2.2.0",
+  "description": "Sitecore Content SDK CLI",
+  "main": "dist/cjs/cli.js",
+  "module": "dist/esm/cli.js",
+  "sideEffects": false,
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "scripts": {
+    "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-esm.json",
+    "clean": "del-cli dist types",
+    "lint": "eslint \"./src/**/*.ts\"",
+    "sitecore-tools": "node ./dist/cjs/bin/sitecore-tools.js",
+    "test": "mocha --require ts-node/register/transpile-only \"./src/**/*.test.ts\"",
+    "coverage": "nyc --require ts-node/register/transpile-only npm test"
+  },
+  "engines": {
+    "node": ">=24"
+  },
+  "preferGlobal": true,
+  "bin": {
+    "sitecore-tools": "./dist/cjs/bin/sitecore-tools.js"
+  },
+  "author": {
+    "name": "Sitecore Corporation",
+    "url": "https://doc.sitecore.com/xmc/en/developers/content-sdk/index.html"
+  },
+  "license": "Apache-2.0",
+  "homepage": "https://doc.sitecore.com/xmc/en/developers/content-sdk/index.html",
+  "bugs": {
+    "url": "https://github.com/sitecore/content-sdk/issues"
+  },
+  "dependencies": {
+    "@sitecore-content-sdk/content": "^2.2.0",
+    "@sitecore-content-sdk/core": "^2.1.1",
+    "chokidar": "^4.0.3",
+    "dotenv": "^16.5.0",
+    "dotenv-expand": "^12.0.2",
+    "inquirer": "^12.9.6",
+    "resolve": "^1.22.10",
+    "tmp": "^0.2.3",
+    "tsx": "^4.19.4",
+    "yargs": "^17.7.2"
+  },
+  "devDependencies": {
+    "@stylistic/eslint-plugin": "^5.2.2",
+    "@types/chai": "^5.2.2",
+    "@types/inquirer": "^9.0.9",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^24.10.4",
+    "@types/resolve": "^1.20.6",
+    "@types/sinon": "^17.0.4",
+    "@types/tmp": "^0.2.6",
+    "@types/yargs": "^17.0.33",
+    "@typescript-eslint/eslint-plugin": "8.39.0",
+    "@typescript-eslint/parser": "8.39.0",
+    "chai": "^4.4.1",
+    "del-cli": "^6.0.0",
+    "eslint": "^9.32.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-import": "2.32.0",
+    "eslint-plugin-jsdoc": "52.0.3",
+    "eslint-plugin-prettier": "^4.0.0",
+    "mocha": "^11.2.2",
+    "nyc": "^17.1.0",
+    "prettier": "^2.8.0",
+    "proxyquire": "^2.1.3",
+    "sinon": "^20.0.0",
+    "ts-node": "^10.9.1",
+    "typescript": "~5.8.3"
+  },
+  "gitHead": "2f4820efddf4454eeee58ed1b2cc251969efdf5b",
+  "files": [
+    "dist",
+    "types"
+  ]
+}
diff --git a/packages/content/CHANGELOG.md b/packages/content/CHANGELOG.md
new file mode 100644
index 0000000000..239c424ae2
--- /dev/null
+++ b/packages/content/CHANGELOG.md
@@ -0,0 +1,18 @@
+# @sitecore-content-sdk/content
+
+## 2.2.0
+
+### Minor Changes
+
+- Support Draft Components ([a1d3798](https://github.com/sitecore/content-sdk/commit/a1d379868299122f98c2bf8e4536466d377703b7))
+
+### Patch Changes
+
+- Personalize hide component does not work properly in edit in case of nested personalization ([77825b9](https://github.com/sitecore/content-sdk/commit/77825b9deac7ebde4022f21ad02170354dd2da15))
+- Fix imageParams breaking preview context images. Preview authentication parameters (ttc, tt, hash) were being stripped when imageParams were applied, causing images to fail loading. These parameters are now preserved in the required params list. ([3dc5fa6](https://github.com/sitecore/content-sdk/commit/3dc5fa6a9ffea34ed539648d3e2e8ac2ce4bf5a4))
+- [content] Fix fallback URL in Sitemapindex ([9d576f7](https://github.com/sitecore/content-sdk/commit/9d576f78e5d0026edc36b285187360ab244a5a41))
+- [core][content] Replace `url-parse` with the WHATWG `URL` API in the GraphQL client and media URL helpers to avoid Node `DEP0169` / legacy URL parsing warnings. ([c50ffd7](https://github.com/sitecore/content-sdk/commit/c50ffd7c4f7e7995d1145f8a5659acb6ed683eab))
+- [content] Fix build crash and normalize DetailedRenderingParams object values for `Styles`, `CSSStyles`, `LibraryId`, and `GridParameters` rendering params ([562866b](https://github.com/sitecore/content-sdk/commit/562866b0bbceb24a31bcd9726c6f74285b50c01d))
+- Fix personalization resolution in Edit Mode and Preview Mode by sending the `sc_variant` header to the Preview GraphQL API so API resolves the active variant server-side, instead of relying on sdk `experiences` filtering. ([858afaf](https://github.com/sitecore/content-sdk/commit/858afaf01a974e0a9c38f2e5c3bd6506458f062b))
+- Support time-based preview via sc_previewTime query parameter. The editing render endpoint now accepts an optional sc_previewTime query parameter and forwards it as a header to Edge Preview GraphQL, enabling calendar-based content validation at specific future dates. ([7b3b3f3](https://github.com/sitecore/content-sdk/commit/7b3b3f30369cf56f5de19926b02ee549d98a34dc))
+- Upgrade glob dependency from deprecated v11 to v13 to resolve security vulnerabilities (CVE-2025-64756) ([debe2bd](https://github.com/sitecore/content-sdk/commit/debe2bd42d32c053245463d40ceb5cb4e1f31690))
diff --git a/packages/content/package.json b/packages/content/package.json
index 84edb20509..3c17ed4564 100644
--- a/packages/content/package.json
+++ b/packages/content/package.json
@@ -1,160 +1,160 @@
-{
-  "name": "@sitecore-content-sdk/content",
-  "version": "2.1.0",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "sideEffects": false,
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "scripts": {
-    "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-esm.json",
-    "clean": "del-cli dist types",
-    "lint": "eslint \"./src/**/*.ts\"",
-    "test": "mocha \"./src/**/*.test.ts\"",
-    "prepublishOnly": "npm run build",
-    "coverage": "nyc npm test",
-    "generate-docs": "npx typedoc --plugin typedoc-plugin-markdown --outputFileStrategy Members --parametersFormat table --readme none --out ../../ref-docs/content --entryPoints src/index.ts --entryPoints src/config/index.ts --entryPoints src/config-cli/index.ts --entryPoints src/client/index.ts --entryPoints src/i18n/index.ts --entryPoints src/layout/index.ts --entryPoints src/media/index.ts --entryPoints src/personalize/index.ts --entryPoints src/site/index.ts --entryPoints src/editing/index.ts --entryPoints src/tools/index.ts --entryPoints src/tools/index-node.ts --entryPoints src/codegen/index.ts --githubPages false",
-    "api-extractor": "npm run build && api-extractor run --local --verbose",
-    "api-extractor:verify": "api-extractor run"
-  },
-  "engines": {
-    "node": ">=24"
-  },
-  "author": {
-    "name": "Sitecore Corporation",
-    "url": "https://doc.sitecore.com/xmc/en/developers/content-sdk/index.html"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Sitecore/content-sdk"
-  },
-  "license": "Apache-2.0",
-  "homepage": "https://doc.sitecore.com/xmc/en/developers/content-sdk/index.html",
-  "bugs": {
-    "url": "https://github.com/sitecore/content-sdk/issues"
-  },
-  "devDependencies": {
-    "@sitecore-content-sdk/events": "^2.1.0",
-    "@stylistic/eslint-plugin": "^5.2.2",
-    "@types/chai": "^5.2.2",
-    "@types/chai-spies": "^1.0.6",
-    "@types/chai-string": "^1.4.5",
-    "@types/debug": "^4.1.12",
-    "@types/jsdom": "^21.1.7",
-    "@types/memory-cache": "^0.2.6",
-    "@types/mocha": "^10.0.10",
-    "@types/node": "^24.10.4",
-    "@types/proxyquire": "^1.3.31",
-    "@types/sinon": "^17.0.4",
-    "@types/sinon-chai": "^4.0.0",
-    "@typescript-eslint/eslint-plugin": "8.39.0",
-    "@typescript-eslint/parser": "8.39.0",
-    "chai": "^4.4.1",
-    "chai-spies": "^1.1.0",
-    "chai-string": "^1.6.0",
-    "del-cli": "^6.0.0",
-    "eslint": "^9.32.0",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-import": "2.32.0",
-    "eslint-plugin-jsdoc": "52.0.3",
-    "eslint-plugin-prettier": "^4.0.0",
-    "jsdom": "^26.1.0",
-    "mocha": "^11.2.2",
-    "nock": "14.0.0-beta.7",
-    "nyc": "^17.1.0",
-    "prettier": "^2.8.0",
-    "proxyquire": "^2.1.3",
-    "sinon": "^20.0.0",
-    "sinon-chai": "^4.0.0",
-    "tslib": "^2.8.1",
-    "tsx": "^4.19.4",
-    "typescript": "~5.8.3"
-  },
-  "peerDependencies": {
-    "@sitecore-content-sdk/events": "^2.1.0"
-  },
-  "dependencies": {
-    "@sitecore-content-sdk/core": "^2.1.0",
-    "chalk": "^4.1.2",
-    "debug": "^4.4.0",
-    "glob": "^13.0.0",
-    "graphql": "^16.11.0"
-  },
-  "description": "",
-  "types": "types/index.d.ts",
-  "gitHead": "2f4820efddf4454eeee58ed1b2cc251969efdf5b",
-  "files": [
-    "dist",
-    "types",
-    "/*.d.ts"
-  ],
-  "exports": {
-    ".": {
-      "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.js",
-      "types": "./types/index.d.ts"
-    },
-    "./client": {
-      "import": "./dist/esm/client/index.js",
-      "require": "./dist/cjs/client/index.js",
-      "types": "./types/client/index.d.ts"
-    },
-    "./config": {
-      "import": "./dist/esm/config/index.js",
-      "require": "./dist/cjs/config/index.js",
-      "types": "./types/config/index.d.ts"
-    },
-    "./config-cli": {
-      "import": "./dist/esm/config-cli/index.js",
-      "require": "./dist/cjs/config-cli/index.js",
-      "types": "./types/config-cli/index.d.ts"
-    },
-    "./codegen": {
-      "import": "./dist/esm/editing/codegen/index.js",
-      "require": "./dist/cjs/editing/codegen/index.js",
-      "types": "./types/editing/codegen/index.d.ts"
-    },
-    "./editing": {
-      "import": "./dist/esm/editing/index.js",
-      "require": "./dist/cjs/editing/index.js",
-      "types": "./types/editing/index.d.ts"
-    },
-    "./i18n": {
-      "import": "./dist/esm/i18n/index.js",
-      "require": "./dist/cjs/i18n/index.js",
-      "types": "./types/i18n/index.d.ts"
-    },
-    "./layout": {
-      "import": "./dist/esm/layout/index.js",
-      "require": "./dist/cjs/layout/index.js",
-      "types": "./types/layout/index.d.ts"
-    },
-    "./media": {
-      "import": "./dist/esm/media/index.js",
-      "require": "./dist/cjs/media/index.js",
-      "types": "./types/media/index.d.ts"
-    },
-    "./personalize": {
-      "import": "./dist/esm/personalize/index.js",
-      "require": "./dist/cjs/personalize/index.js",
-      "types": "./types/personalize/index.d.ts"
-    },
-    "./site": {
-      "import": "./dist/esm/site/index.js",
-      "require": "./dist/cjs/site/index.js",
-      "types": "./types/site/index.d.ts"
-    },
-    "./tools": {
-      "import": "./dist/esm/tools/index.js",
-      "require": "./dist/cjs/tools/index.js",
-      "types": "./types/tools/index.d.ts"
-    },
-    "./node-tools": {
-      "import": "./dist/esm/tools/index-node.js",
-      "require": "./dist/cjs/tools/index-node.js",
-      "types": "./types/tools/index-node.d.ts"
-    }
-  }
-}
+{
+  "name": "@sitecore-content-sdk/content",
+  "version": "2.2.0",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
+  "sideEffects": false,
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "scripts": {
+    "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-esm.json",
+    "clean": "del-cli dist types",
+    "lint": "eslint \"./src/**/*.ts\"",
+    "test": "mocha \"./src/**/*.test.ts\"",
+    "prepublishOnly": "npm run build",
+    "coverage": "nyc npm test",
+    "generate-docs": "npx typedoc --plugin typedoc-plugin-markdown --outputFileStrategy Members --parametersFormat table --readme none --out ../../ref-docs/content --entryPoints src/index.ts --entryPoints src/config/index.ts --entryPoints src/config-cli/index.ts --entryPoints src/client/index.ts --entryPoints src/i18n/index.ts --entryPoints src/layout/index.ts --entryPoints src/media/index.ts --entryPoints src/personalize/index.ts --entryPoints src/site/index.ts --entryPoints src/editing/index.ts --entryPoints src/tools/index.ts --entryPoints src/tools/index-node.ts --entryPoints src/codegen/index.ts --githubPages false",
+    "api-extractor": "npm run build && api-extractor run --local --verbose",
+    "api-extractor:verify": "api-extractor run"
+  },
+  "engines": {
+    "node": ">=24"
+  },
+  "author": {
+    "name": "Sitecore Corporation",
+    "url": "https://doc.sitecore.com/xmc/en/developers/content-sdk/index.html"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Sitecore/content-sdk"
+  },
+  "license": "Apache-2.0",
+  "homepage": "https://doc.sitecore.com/xmc/en/developers/content-sdk/index.html",
+  "bugs": {
+    "url": "https://github.com/sitecore/content-sdk/issues"
+  },
+  "devDependencies": {
+    "@sitecore-content-sdk/events": "^2.1.0",
+    "@stylistic/eslint-plugin": "^5.2.2",
+    "@types/chai": "^5.2.2",
+    "@types/chai-spies": "^1.0.6",
+    "@types/chai-string": "^1.4.5",
+    "@types/debug": "^4.1.12",
+    "@types/jsdom": "^21.1.7",
+    "@types/memory-cache": "^0.2.6",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^24.10.4",
+    "@types/proxyquire": "^1.3.31",
+    "@types/sinon": "^17.0.4",
+    "@types/sinon-chai": "^4.0.0",
+    "@typescript-eslint/eslint-plugin": "8.39.0",
+    "@typescript-eslint/parser": "8.39.0",
+    "chai": "^4.4.1",
+    "chai-spies": "^1.1.0",
+    "chai-string": "^1.6.0",
+    "del-cli": "^6.0.0",
+    "eslint": "^9.32.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-import": "2.32.0",
+    "eslint-plugin-jsdoc": "52.0.3",
+    "eslint-plugin-prettier": "^4.0.0",
+    "jsdom": "^26.1.0",
+    "mocha": "^11.2.2",
+    "nock": "14.0.0-beta.7",
+    "nyc": "^17.1.0",
+    "prettier": "^2.8.0",
+    "proxyquire": "^2.1.3",
+    "sinon": "^20.0.0",
+    "sinon-chai": "^4.0.0",
+    "tslib": "^2.8.1",
+    "tsx": "^4.19.4",
+    "typescript": "~5.8.3"
+  },
+  "peerDependencies": {
+    "@sitecore-content-sdk/events": "^2.1.0"
+  },
+  "dependencies": {
+    "@sitecore-content-sdk/core": "^2.1.1",
+    "chalk": "^4.1.2",
+    "debug": "^4.4.0",
+    "glob": "^13.0.0",
+    "graphql": "^16.11.0"
+  },
+  "description": "",
+  "types": "types/index.d.ts",
+  "gitHead": "2f4820efddf4454eeee58ed1b2cc251969efdf5b",
+  "files": [
+    "dist",
+    "types",
+    "/*.d.ts"
+  ],
+  "exports": {
+    ".": {
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js",
+      "types": "./types/index.d.ts"
+    },
+    "./client": {
+      "import": "./dist/esm/client/index.js",
+      "require": "./dist/cjs/client/index.js",
+      "types": "./types/client/index.d.ts"
+    },
+    "./config": {
+      "import": "./dist/esm/config/index.js",
+      "require": "./dist/cjs/config/index.js",
+      "types": "./types/config/index.d.ts"
+    },
+    "./config-cli": {
+      "import": "./dist/esm/config-cli/index.js",
+      "require": "./dist/cjs/config-cli/index.js",
+      "types": "./types/config-cli/index.d.ts"
+    },
+    "./codegen": {
+      "import": "./dist/esm/editing/codegen/index.js",
+      "require": "./dist/cjs/editing/codegen/index.js",
+      "types": "./types/editing/codegen/index.d.ts"
+    },
+    "./editing": {
+      "import": "./dist/esm/editing/index.js",
+      "require": "./dist/cjs/editing/index.js",
+      "types": "./types/editing/index.d.ts"
+    },
+    "./i18n": {
+      "import": "./dist/esm/i18n/index.js",
+      "require": "./dist/cjs/i18n/index.js",
+      "types": "./types/i18n/index.d.ts"
+    },
+    "./layout": {
+      "import": "./dist/esm/layout/index.js",
+      "require": "./dist/cjs/layout/index.js",
+      "types": "./types/layout/index.d.ts"
+    },
+    "./media": {
+      "import": "./dist/esm/media/index.js",
+      "require": "./dist/cjs/media/index.js",
+      "types": "./types/media/index.d.ts"
+    },
+    "./personalize": {
+      "import": "./dist/esm/personalize/index.js",
+      "require": "./dist/cjs/personalize/index.js",
+      "types": "./types/personalize/index.d.ts"
+    },
+    "./site": {
+      "import": "./dist/esm/site/index.js",
+      "require": "./dist/cjs/site/index.js",
+      "types": "./types/site/index.d.ts"
+    },
+    "./tools": {
+      "import": "./dist/esm/tools/index.js",
+      "require": "./dist/cjs/tools/index.js",
+      "types": "./types/tools/index.d.ts"
+    },
+    "./node-tools": {
+      "import": "./dist/esm/tools/index-node.js",
+      "require": "./dist/cjs/tools/index-node.js",
+      "types": "./types/tools/index-node.d.ts"
+    }
+  }
+}
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
new file mode 100644
index 0000000000..8d9e607cd2
--- /dev/null
+++ b/packages/core/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @sitecore-content-sdk/core
+
+## 2.1.1
+
+### Patch Changes
+
+- [core][content] Replace `url-parse` with the WHATWG `URL` API in the GraphQL client and media URL helpers to avoid Node `DEP0169` / legacy URL parsing warnings. ([c50ffd7](https://github.com/sitecore/content-sdk/commit/c50ffd7c4f7e7995d1145f8a5659acb6ed683eab))
diff --git a/packages/core/package.json b/packages/core/package.json
index 6bb3c7c784..d323645dba 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-content-sdk/core",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
diff --git a/packages/create-content-sdk-app/CHANGELOG.md b/packages/create-content-sdk-app/CHANGELOG.md
new file mode 100644
index 0000000000..1b85b4c6b9
--- /dev/null
+++ b/packages/create-content-sdk-app/CHANGELOG.md
@@ -0,0 +1,38 @@
+# create-content-sdk-app
+
+## 2.2.0
+
+### Minor Changes
+
+- Add tag-based revalidation support for the Next.js App Router with Cache Components, including cache tag helpers and revalidation route handlers. ([856cb89](https://github.com/sitecore/content-sdk/commit/856cb89263cff3f1e39e74ebd0ae054e4bd68391))
+
+  Introduce the `nextjs-app-router-cache-components` scaffolding template with a combined revalidation route wired out of the box.
+
+- [cli][create-content-sdk-app] Update build and component map generation to recreate the .sitecore directory when it is missing. ([0325d61](https://github.com/sitecore/content-sdk/commit/0325d614f670aabc44a25c7deff996ace6a1fe8c))
+
+### Patch Changes
+
+- Remove unused config section from nextjs template package.json to eliminate npm warnings about unknown CLI config settings. ([f81ac30](https://github.com/sitecore/content-sdk/commit/f81ac302196d17f88b825b61a78d1f683cc0cb7b))
+- [create-content-sdk-app] Add help flag output ([386c7f8](https://github.com/sitecore/content-sdk/commit/386c7f8bd3745fb4187e490efe4dd14be4a48189))
+- [create-content-sdk-app] Fix custom 404 handling in cache-components template ([7d29ee8](https://github.com/sitecore/content-sdk/commit/7d29ee8df75a9fcce488bbf9baac1d82ba219e99))
+- Scope Tailwind v4 source scanning to app `src` in App Router templates so monorepo `yarn watch` samples do not hang or fail on `globals.css` when symlinked SDK packages are scanned. ([f28b4a1](https://github.com/sitecore/content-sdk/commit/f28b4a16c174b08cc6903fe1f81d5bfea7fc028e))
+- [create-content-sdk-app] Add PartialDesignDynamicPlaceholder to App Router and Pages Router templates for Sitecore AI partial designs ([85b14a9](https://github.com/sitecore/content-sdk/commit/85b14a924e1541b929221c290dd9186542d52050))
+- [create-content-sdk][Chore] The template version management has been adjusted for multi-version use ([3f9282b](https://github.com/sitecore/content-sdk/commit/3f9282b10be88272be44a3998ccbb34d4428d66a))
+- [create-content-sdk-app] Remove redundant --template from help options ([3631584](https://github.com/sitecore/content-sdk/commit/363158477ed913ddfbe904264deebf83015ebcdb))
+- Upgrade glob dependency from deprecated v11 to v13 to resolve security vulnerabilities (CVE-2025-64756) ([debe2bd](https://github.com/sitecore/content-sdk/commit/debe2bd42d32c053245463d40ceb5cb4e1f31690))
+- minor `@sitecore-content-sdk/cli` dependency update:
+  - [cli][create-content-sdk-app] Update build and component map generation to recreate the .sitecore directory when it is missing. ([0325d61](https://github.com/sitecore/content-sdk/commit/0325d614f670aabc44a25c7deff996ace6a1fe8c))
+- minor `@sitecore-content-sdk/content` dependency update:
+  - Support Draft Components ([a1d3798](https://github.com/sitecore/content-sdk/commit/a1d379868299122f98c2bf8e4536466d377703b7))
+- minor `@sitecore-content-sdk/nextjs` dependency update:
+
+  - [nextjs] Add context to nextjs proxies that the developers can use to get information an what was executed inside each proxy ([97ebaca](https://github.com/sitecore/content-sdk/commit/97ebacafeda3114eace6f291c3fbb622e2944a72))
+  - Support Draft Components ([a1d3798](https://github.com/sitecore/content-sdk/commit/a1d379868299122f98c2bf8e4536466d377703b7))
+  - [nextjs] Fix sitemap route validation to return undefined for sitemap-index path. ([ecba275](https://github.com/sitecore/content-sdk/commit/ecba2755393ad3977546ad3dd9af18483599661e))
+  - [nextjs][react] Add renderChildrenWhenEmpty prop to Link component to render empty anchor with children instead of null when the link field value is empty. ([741a10f](https://github.com/sitecore/content-sdk/commit/741a10fca7aacb6f4518425a45f3773d17a013c1))
+  - Add tag-based revalidation support for the Next.js App Router with Cache Components, including cache tag helpers and revalidation route handlers.
+
+  Introduce the `nextjs-app-router-cache-components` scaffolding template with a combined revalidation route wired out of the box. ([856cb89](https://github.com/sitecore/content-sdk/commit/856cb89263cff3f1e39e74ebd0ae054e4bd68391))
+
+- minor `@sitecore-content-sdk/react` dependency update:
+  - [nextjs][react] Add renderChildrenWhenEmpty prop to Link component to render empty anchor with children instead of null when the link field value is empty. ([741a10f](https://github.com/sitecore/content-sdk/commit/741a10fca7aacb6f4518425a45f3773d17a013c1))
diff --git a/packages/create-content-sdk-app/package.json b/packages/create-content-sdk-app/package.json
index 2dc9050fb8..1a18f42453 100644
--- a/packages/create-content-sdk-app/package.json
+++ b/packages/create-content-sdk-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-content-sdk-app",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Sitecore Content SDK initializer",
   "bin": "./dist/index.js",
   "scripts": {
@@ -39,9 +39,9 @@
   },
   "devDependencies": {
     "@sitecore-content-sdk/analytics-core": "^2.1.0",
-    "@sitecore-content-sdk/cli": "^2.1.0",
+    "@sitecore-content-sdk/cli": "^2.2.0",
     "@sitecore-content-sdk/events": "^2.1.0",
-    "@sitecore-content-sdk/nextjs": "^2.1.0",
+    "@sitecore-content-sdk/nextjs": "^2.2.0",
     "@sitecore-content-sdk/personalize": "^2.1.0",
     "@stylistic/eslint-plugin": "^5.2.2",
     "@types/chai": "^5.2.2",
diff --git a/packages/nextjs/CHANGELOG.md b/packages/nextjs/CHANGELOG.md
new file mode 100644
index 0000000000..ce34c8c975
--- /dev/null
+++ b/packages/nextjs/CHANGELOG.md
@@ -0,0 +1,32 @@
+# @sitecore-content-sdk/nextjs
+
+## 2.2.0
+
+### Minor Changes
+
+- [nextjs] Add context to nextjs proxies that the developers can use to get information an what was executed inside each proxy ([97ebaca](https://github.com/sitecore/content-sdk/commit/97ebacafeda3114eace6f291c3fbb622e2944a72))
+- Support Draft Components ([a1d3798](https://github.com/sitecore/content-sdk/commit/a1d379868299122f98c2bf8e4536466d377703b7))
+- [nextjs] Fix sitemap route validation to return undefined for sitemap-index path. ([ecba275](https://github.com/sitecore/content-sdk/commit/ecba2755393ad3977546ad3dd9af18483599661e))
+- [nextjs][react] Add renderChildrenWhenEmpty prop to Link component to render empty anchor with children instead of null when the link field value is empty. ([741a10f](https://github.com/sitecore/content-sdk/commit/741a10fca7aacb6f4518425a45f3773d17a013c1))
+- Add tag-based revalidation support for the Next.js App Router with Cache Components, including cache tag helpers and revalidation route handlers. ([856cb89](https://github.com/sitecore/content-sdk/commit/856cb89263cff3f1e39e74ebd0ae054e4bd68391))
+
+  Introduce the `nextjs-app-router-cache-components` scaffolding template with a combined revalidation route wired out of the box.
+
+- minor `@sitecore-content-sdk/content` dependency update:
+  - Support Draft Components ([a1d3798](https://github.com/sitecore/content-sdk/commit/a1d379868299122f98c2bf8e4536466d377703b7))
+- minor `@sitecore-content-sdk/react` dependency update:
+  - [nextjs][react] Add renderChildrenWhenEmpty prop to Link component to render empty anchor with children instead of null when the link field value is empty. ([741a10f](https://github.com/sitecore/content-sdk/commit/741a10fca7aacb6f4518425a45f3773d17a013c1))
+
+### Patch Changes
+
+- [nextjs][Fix] Correct redirect-map regex matching and capture replacement for anchored patterns, locale-prefixed paths, and root-path redirects. ([30b0db8](https://github.com/sitecore/content-sdk/commit/30b0db8fe768b83f03fd6b9772b0d3e14711c6b2))
+- 500 Internal Server Error occurs in Pages editor when Server error page is opened ([6b5ddb4](https://github.com/sitecore/content-sdk/commit/6b5ddb46afb5e20b513a1bf5d7977b5cb27bfdc2))
+- BYOC and FEAAS are broken when client component map generation is disabled ([d9d50e1](https://github.com/sitecore/content-sdk/commit/d9d50e1e9cf196032766ca4287d4c24576cabbd6))
+- Remove unused sync-disk-cache dependency which was unmaintained and had security warnings. The package was declared but never actually imported or used in the codebase. ([585d583](https://github.com/sitecore/content-sdk/commit/585d583b22461a5fc38589fdf351e01bd3e65204))
+- [Pages Router] Set auth token in proxy and api route for preview protection ([421d910](https://github.com/sitecore/content-sdk/commit/421d9105c87752d5bb0d388661240bd0d97920b1))
+- Fix personalization resolution in Edit Mode and Preview Mode by sending the `sc_variant` header to the Preview GraphQL API so API resolves the active variant server-side, instead of relying on sdk `experiences` filtering. ([858afaf](https://github.com/sitecore/content-sdk/commit/858afaf01a974e0a9c38f2e5c3bd6506458f062b))
+- Fallback of clientComponentMap option in defineCliConfig reverted to be true ([553b16a](https://github.com/sitecore/content-sdk/commit/553b16a67e807643f564a3c5208631654e0b2cef))
+- Pass sc_previewMode, sc_site when performing authorization in PreviewProxy ([ced58bb](https://github.com/sitecore/content-sdk/commit/ced58bb49648d0be99eb0979ab77edb76e1a6a33))
+- Support time-based preview via sc_previewTime query parameter. The editing render endpoint now accepts an optional sc_previewTime query parameter and forwards it as a header to Edge Preview GraphQL, enabling calendar-based content validation at specific future dates. ([7b3b3f3](https://github.com/sitecore/content-sdk/commit/7b3b3f30369cf56f5de19926b02ee549d98a34dc))
+- Upgrade glob dependency from deprecated v11 to v13 to resolve security vulnerabilities (CVE-2025-64756) ([debe2bd](https://github.com/sitecore/content-sdk/commit/debe2bd42d32c053245463d40ceb5cb4e1f31690))
+- Check sc_site search parameter in PreviewProxy as a fallback when cookie is missing ([2204da3](https://github.com/sitecore/content-sdk/commit/2204da329c1296334b71f674795af93d93d50ee9))
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index f20ea6d8df..aa0b6029ba 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-content-sdk/nextjs",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -90,10 +90,10 @@
   },
   "dependencies": {
     "@babel/parser": "^7.27.2",
-    "@sitecore-content-sdk/content": "^2.1.0",
-    "@sitecore-content-sdk/core": "^2.1.0",
+    "@sitecore-content-sdk/content": "^2.2.0",
+    "@sitecore-content-sdk/core": "^2.1.1",
     "@sitecore-content-sdk/events": "^2.1.0",
-    "@sitecore-content-sdk/react": "^2.1.0",
+    "@sitecore-content-sdk/react": "^2.2.0",
     "recast": "^0.23.11",
     "regex-parser": "^2.3.1"
   },
diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
new file mode 100644
index 0000000000..1594d8074f
--- /dev/null
+++ b/packages/react/CHANGELOG.md
@@ -0,0 +1,9 @@
+# @sitecore-content-sdk/react
+
+## 2.2.0
+
+### Minor Changes
+
+- [nextjs][react] Add renderChildrenWhenEmpty prop to Link component to render empty anchor with children instead of null when the link field value is empty. ([741a10f](https://github.com/sitecore/content-sdk/commit/741a10fca7aacb6f4518425a45f3773d17a013c1))
+- minor `@sitecore-content-sdk/content` dependency update:
+  - Support Draft Components ([a1d3798](https://github.com/sitecore/content-sdk/commit/a1d379868299122f98c2bf8e4536466d377703b7))
diff --git a/packages/react/package.json b/packages/react/package.json
index 111a8ff4b1..30c4d532b6 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,116 +1,116 @@
-{
-  "name": "@sitecore-content-sdk/react",
-  "version": "2.1.0",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "sideEffects": false,
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "scripts": {
-    "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-esm.json",
-    "clean": "del-cli dist types",
-    "lint": "eslint \"./src/**/*.tsx\" \"./src/**/*.ts\"",
-    "test": "mocha --require ./test/setup.js \"./src/**/*.test.ts\" \"./src/**/*.test.tsx\" --exit",
-    "prepublishOnly": "npm run build",
-    "coverage": "nyc npm test",
-    "generate-docs": "npx typedoc --plugin typedoc-plugin-markdown --outputFileStrategy Members --parametersFormat table --readme none --out ../../ref-docs/react src/index.ts --githubPages false",
-    "api-extractor": "npm run build && api-extractor run --local --verbose",
-    "api-extractor:verify": "api-extractor run"
-  },
-  "engines": {
-    "node": ">=24"
-  },
-  "author": {
-    "name": "Sitecore Corporation",
-    "url": "https://doc.sitecore.com/xmc/en/developers/content-sdk/index.html"
-  },
-  "license": "Apache-2.0",
-  "homepage": "https://doc.sitecore.com/xmc/en/developers/content-sdk/index.html",
-  "bugs": {
-    "url": "https://github.com/sitecore/content-sdk/issues"
-  },
-  "devDependencies": {
-    "@sitecore-content-sdk/analytics-core": "^2.1.0",
-    "@sitecore-feaas/clientside": "^0.6.0",
-    "@stylistic/eslint-plugin": "^5.2.2",
-    "@testing-library/dom": "^10.4.0",
-    "@testing-library/react": "^16.3.0",
-    "@types/chai": "^5.2.2",
-    "@types/chai-string": "^1.4.5",
-    "@types/mocha": "^10.0.10",
-    "@types/node": "^24.10.4",
-    "@types/proxyquire": "^1.3.31",
-    "@types/react": "^19.2.7",
-    "@types/react-dom": "^19.2.3",
-    "@types/sinon": "^17.0.4",
-    "@types/sinon-chai": "^4.0.0",
-    "@typescript-eslint/eslint-plugin": "8.39.0",
-    "@typescript-eslint/parser": "8.39.0",
-    "chai": "^4.3.7",
-    "chai-string": "^1.6.0",
-    "del-cli": "^6.0.0",
-    "eslint": "^9.32.0",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-import": "2.32.0",
-    "eslint-plugin-jsdoc": "52.0.3",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "7.37.5",
-    "eslint-plugin-react-hooks": "5.2.0",
-    "jsdom": "^26.1.0",
-    "mocha": "^11.2.2",
-    "nyc": "^17.1.0",
-    "prettier": "^2.8.0",
-    "proxyquire": "^2.1.3",
-    "react": "^19.2.1",
-    "react-dom": "^19.2.1",
-    "sinon": "^20.0.0",
-    "sinon-chai": "^3.7.0",
-    "ts-node": "^10.9.2",
-    "typescript": "~5.8.3"
-  },
-  "peerDependencies": {
-    "@sitecore-content-sdk/analytics-core": "^2.1.0",
-    "@sitecore-content-sdk/events": "^2.1.0",
-    "@sitecore-feaas/clientside": "^0.6.0",
-    "react": "^19.2.1",
-    "react-dom": "^19.2.1"
-  },
-  "dependencies": {
-    "@sitecore-content-sdk/content": "^2.1.0",
-    "@sitecore-content-sdk/core": "^2.1.0",
-    "@sitecore-content-sdk/search": "^0.3.0",
-    "fast-deep-equal": "^3.1.3"
-  },
-  "description": "",
-  "types": "types/index.d.ts",
-  "gitHead": "2f4820efddf4454eeee58ed1b2cc251969efdf5b",
-  "files": [
-    "dist",
-    "types",
-    "/*.d.ts"
-  ],
-  "exports": {
-    ".": {
-      "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.js",
-      "types": "./types/index.d.ts"
-    },
-    "./search": {
-      "import": "./dist/esm/search/index.js",
-      "require": "./dist/cjs/search/index.js",
-      "types": "./types/search/index.d.ts"
-    }
-  },
-  "imports": {
-    "#rsc-env": {
-      "react-server": {
-        "import": "./dist/esm/rsc-utils/rsc.js",
-        "default": "./dist/cjs/rsc-utils/rsc.js"
-      },
-      "import": "./dist/esm/rsc-utils/no-rsc.js",
-      "default": "./dist/cjs/rsc-utils/no-rsc.js"
-    }
-  }
-}
+{
+  "name": "@sitecore-content-sdk/react",
+  "version": "2.2.0",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
+  "sideEffects": false,
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "scripts": {
+    "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-esm.json",
+    "clean": "del-cli dist types",
+    "lint": "eslint \"./src/**/*.tsx\" \"./src/**/*.ts\"",
+    "test": "mocha --require ./test/setup.js \"./src/**/*.test.ts\" \"./src/**/*.test.tsx\" --exit",
+    "prepublishOnly": "npm run build",
+    "coverage": "nyc npm test",
+    "generate-docs": "npx typedoc --plugin typedoc-plugin-markdown --outputFileStrategy Members --parametersFormat table --readme none --out ../../ref-docs/react src/index.ts --githubPages false",
+    "api-extractor": "npm run build && api-extractor run --local --verbose",
+    "api-extractor:verify": "api-extractor run"
+  },
+  "engines": {
+    "node": ">=24"
+  },
+  "author": {
+    "name": "Sitecore Corporation",
+    "url": "https://doc.sitecore.com/xmc/en/developers/content-sdk/index.html"
+  },
+  "license": "Apache-2.0",
+  "homepage": "https://doc.sitecore.com/xmc/en/developers/content-sdk/index.html",
+  "bugs": {
+    "url": "https://github.com/sitecore/content-sdk/issues"
+  },
+  "devDependencies": {
+    "@sitecore-content-sdk/analytics-core": "^2.1.0",
+    "@sitecore-feaas/clientside": "^0.6.0",
+    "@stylistic/eslint-plugin": "^5.2.2",
+    "@testing-library/dom": "^10.4.0",
+    "@testing-library/react": "^16.3.0",
+    "@types/chai": "^5.2.2",
+    "@types/chai-string": "^1.4.5",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^24.10.4",
+    "@types/proxyquire": "^1.3.31",
+    "@types/react": "^19.2.7",
+    "@types/react-dom": "^19.2.3",
+    "@types/sinon": "^17.0.4",
+    "@types/sinon-chai": "^4.0.0",
+    "@typescript-eslint/eslint-plugin": "8.39.0",
+    "@typescript-eslint/parser": "8.39.0",
+    "chai": "^4.3.7",
+    "chai-string": "^1.6.0",
+    "del-cli": "^6.0.0",
+    "eslint": "^9.32.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-import": "2.32.0",
+    "eslint-plugin-jsdoc": "52.0.3",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-react": "7.37.5",
+    "eslint-plugin-react-hooks": "5.2.0",
+    "jsdom": "^26.1.0",
+    "mocha": "^11.2.2",
+    "nyc": "^17.1.0",
+    "prettier": "^2.8.0",
+    "proxyquire": "^2.1.3",
+    "react": "^19.2.1",
+    "react-dom": "^19.2.1",
+    "sinon": "^20.0.0",
+    "sinon-chai": "^3.7.0",
+    "ts-node": "^10.9.2",
+    "typescript": "~5.8.3"
+  },
+  "peerDependencies": {
+    "@sitecore-content-sdk/analytics-core": "^2.1.0",
+    "@sitecore-content-sdk/events": "^2.1.0",
+    "@sitecore-feaas/clientside": "^0.6.0",
+    "react": "^19.2.1",
+    "react-dom": "^19.2.1"
+  },
+  "dependencies": {
+    "@sitecore-content-sdk/content": "^2.2.0",
+    "@sitecore-content-sdk/core": "^2.1.1",
+    "@sitecore-content-sdk/search": "^0.3.0",
+    "fast-deep-equal": "^3.1.3"
+  },
+  "description": "",
+  "types": "types/index.d.ts",
+  "gitHead": "2f4820efddf4454eeee58ed1b2cc251969efdf5b",
+  "files": [
+    "dist",
+    "types",
+    "/*.d.ts"
+  ],
+  "exports": {
+    ".": {
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js",
+      "types": "./types/index.d.ts"
+    },
+    "./search": {
+      "import": "./dist/esm/search/index.js",
+      "require": "./dist/cjs/search/index.js",
+      "types": "./types/search/index.d.ts"
+    }
+  },
+  "imports": {
+    "#rsc-env": {
+      "react-server": {
+        "import": "./dist/esm/rsc-utils/rsc.js",
+        "default": "./dist/cjs/rsc-utils/rsc.js"
+      },
+      "import": "./dist/esm/rsc-utils/no-rsc.js",
+      "default": "./dist/cjs/rsc-utils/no-rsc.js"
+    }
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index 824ceb9c11..f926742f5c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3538,12 +3538,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sitecore-content-sdk/cli@npm:^2.1.0, @sitecore-content-sdk/cli@workspace:packages/cli":
+"@sitecore-content-sdk/cli@npm:^2.2.0, @sitecore-content-sdk/cli@workspace:packages/cli":
   version: 0.0.0-use.local
   resolution: "@sitecore-content-sdk/cli@workspace:packages/cli"
   dependencies:
-    "@sitecore-content-sdk/content": "npm:^2.1.0"
-    "@sitecore-content-sdk/core": "npm:^2.1.0"
+    "@sitecore-content-sdk/content": "npm:^2.2.0"
+    "@sitecore-content-sdk/core": "npm:^2.1.1"
     "@stylistic/eslint-plugin": "npm:^5.2.2"
     "@types/chai": "npm:^5.2.2"
     "@types/inquirer": "npm:^9.0.9"
@@ -3582,11 +3582,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sitecore-content-sdk/content@npm:^2.1.0, @sitecore-content-sdk/content@workspace:packages/content":
+"@sitecore-content-sdk/content@npm:^2.2.0, @sitecore-content-sdk/content@workspace:packages/content":
   version: 0.0.0-use.local
   resolution: "@sitecore-content-sdk/content@workspace:packages/content"
   dependencies:
-    "@sitecore-content-sdk/core": "npm:^2.1.0"
+    "@sitecore-content-sdk/core": "npm:^2.1.1"
     "@sitecore-content-sdk/events": "npm:^2.1.0"
     "@stylistic/eslint-plugin": "npm:^5.2.2"
     "@types/chai": "npm:^5.2.2"
@@ -3631,7 +3631,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sitecore-content-sdk/core@npm:^2.1.0, @sitecore-content-sdk/core@workspace:packages/core":
+"@sitecore-content-sdk/core@npm:^2.1.0, @sitecore-content-sdk/core@npm:^2.1.1, @sitecore-content-sdk/core@workspace:packages/core":
   version: 0.0.0-use.local
   resolution: "@sitecore-content-sdk/core@workspace:packages/core"
   dependencies:
@@ -3698,17 +3698,17 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sitecore-content-sdk/nextjs@npm:^2.1.0, @sitecore-content-sdk/nextjs@workspace:packages/nextjs":
+"@sitecore-content-sdk/nextjs@npm:^2.2.0, @sitecore-content-sdk/nextjs@workspace:packages/nextjs":
   version: 0.0.0-use.local
   resolution: "@sitecore-content-sdk/nextjs@workspace:packages/nextjs"
   dependencies:
     "@babel/parser": "npm:^7.27.2"
     "@sitecore-content-sdk/analytics-core": "npm:^2.1.0"
-    "@sitecore-content-sdk/content": "npm:^2.1.0"
-    "@sitecore-content-sdk/core": "npm:^2.1.0"
+    "@sitecore-content-sdk/content": "npm:^2.2.0"
+    "@sitecore-content-sdk/core": "npm:^2.1.1"
     "@sitecore-content-sdk/events": "npm:^2.1.0"
     "@sitecore-content-sdk/personalize": "npm:^2.1.0"
-    "@sitecore-content-sdk/react": "npm:^2.1.0"
+    "@sitecore-content-sdk/react": "npm:^2.2.0"
     "@stylistic/eslint-plugin": "npm:^5.2.2"
     "@testing-library/dom": "npm:^10.4.0"
     "@testing-library/react": "npm:^16.3.0"
@@ -3793,13 +3793,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sitecore-content-sdk/react@npm:^2.1.0, @sitecore-content-sdk/react@workspace:packages/react":
+"@sitecore-content-sdk/react@npm:^2.2.0, @sitecore-content-sdk/react@workspace:packages/react":
   version: 0.0.0-use.local
   resolution: "@sitecore-content-sdk/react@workspace:packages/react"
   dependencies:
     "@sitecore-content-sdk/analytics-core": "npm:^2.1.0"
-    "@sitecore-content-sdk/content": "npm:^2.1.0"
-    "@sitecore-content-sdk/core": "npm:^2.1.0"
+    "@sitecore-content-sdk/content": "npm:^2.2.0"
+    "@sitecore-content-sdk/core": "npm:^2.1.1"
     "@sitecore-content-sdk/search": "npm:^0.3.0"
     "@sitecore-feaas/clientside": "npm:^0.6.0"
     "@stylistic/eslint-plugin": "npm:^5.2.2"
@@ -6422,9 +6422,9 @@ __metadata:
   resolution: "create-content-sdk-app@workspace:packages/create-content-sdk-app"
   dependencies:
     "@sitecore-content-sdk/analytics-core": "npm:^2.1.0"
-    "@sitecore-content-sdk/cli": "npm:^2.1.0"
+    "@sitecore-content-sdk/cli": "npm:^2.2.0"
     "@sitecore-content-sdk/events": "npm:^2.1.0"
-    "@sitecore-content-sdk/nextjs": "npm:^2.1.0"
+    "@sitecore-content-sdk/nextjs": "npm:^2.2.0"
     "@sitecore-content-sdk/personalize": "npm:^2.1.0"
     "@stylistic/eslint-plugin": "npm:^5.2.2"
     "@types/chai": "npm:^5.2.2"