From 92bafd0afd864f387b480ff51beca71c2f5d7a5c Mon Sep 17 00:00:00 2001 From: illiakovalenko Date: Thu, 5 Dec 2024 11:56:04 +0200 Subject: [PATCH 1/3] [sitecore-jss-nextjs] Reverted back "next" peerDependency --- packages/sitecore-jss-nextjs/package.json | 1 + yarn.lock | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/sitecore-jss-nextjs/package.json b/packages/sitecore-jss-nextjs/package.json index 3acf7ace54..529083b532 100644 --- a/packages/sitecore-jss-nextjs/package.json +++ b/packages/sitecore-jss-nextjs/package.json @@ -68,6 +68,7 @@ "peerDependencies": { "@sitecore-cloudsdk/core": "^0.4.1", "@sitecore-cloudsdk/personalize": "^0.4.1", + "next": "^14.2.18", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/yarn.lock b/yarn.lock index 6fc77a0d25..489fe84e7b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6063,6 +6063,7 @@ __metadata: peerDependencies: "@sitecore-cloudsdk/core": ^0.4.1 "@sitecore-cloudsdk/personalize": ^0.4.1 + next: ^14.2.18 react: ^18.2.0 react-dom: ^18.2.0 languageName: unknown From 0a62c4f9337cf42f0828ee1549ecacf9c2a1f2bb Mon Sep 17 00:00:00 2001 From: illiakovalenko Date: Thu, 5 Dec 2024 12:13:20 +0200 Subject: [PATCH 2/3] Updated CHANGELOG [skip ci] --- CHANGELOG.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccabb6667e..702e188b84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,7 +42,7 @@ Our versioning strategy is as follows: * `[templates/angular]` `[templates/angular-xmcloud]` `[template/node-xmcloud-proxy]` `[sitecore-jss-proxy]` Introduced /api/editing/config endpoint ([#1903](https://github.com/Sitecore/jss/pull/1903)) * `[templates/angular]` `[templates/angular-xmcloud]` `[template/node-xmcloud-proxy]` `[sitecore-jss-proxy]` Introduced /api/editing/render endpoint ([#1908](https://github.com/Sitecore/jss/pull/1908)) * `[templates/angular-xmcloud]` `[template/node-xmcloud-proxy]` Personalization support ([#1964](https://github.com/Sitecore/jss/pull/1964)[#1971](https://github.com/Sitecore/jss/pull/1971)[#1973](https://github.com/Sitecore/jss/pull/1973)) -* `[create-sitecore-jss]``[sitecore-jss-angular]``[template/angular-xmcloud]` Angular SXA components +* `[create-sitecore-jss]` `[sitecore-jss-angular]` `[template/angular-xmcloud]` Angular SXA components * Angular placeholder now supports SXA components ([#1870](https://github.com/Sitecore/jss/pull/1870)) * Component styles ([#1917](https://github.com/Sitecore/jss/pull/1917)) * Title component ([#1904](https://github.com/Sitecore/jss/pull/1904)) @@ -57,7 +57,7 @@ Our versioning strategy is as follows: * PageContent component ([#1905](https://github.com/Sitecore/jss/pull/1905)) * Navigation component ([#1894](https://github.com/Sitecore/jss/pull/1894)) * `[sitecore-jss-angular]` Placeholder component will now render metadata code blocks when in Metadata Edit mode ([#1918](https://github.com/Sitecore/jss/pull/1918)) -* `[sitecore-jss]``[sitecore-jss-angular]` Default Placeholder Content for empty fields in editMode metadata - in edit mode metadata in Pages, angular package field directives will render default or custom placeholder content if the provided field is empty; ([#1916](https://github.com/Sitecore/jss/pull/1916)) +* `[sitecore-jss]` `[sitecore-jss-angular]` Default Placeholder Content for empty fields in editMode metadata - in edit mode metadata in Pages, angular package field directives will render default or custom placeholder content if the provided field is empty; ([#1916](https://github.com/Sitecore/jss/pull/1916)) * custom placeholder content can be provided to field directives by passing the corresponding input: - `scDateEmptyFieldEditingTemplate` for _scDate_ - `scGenericLinkEmptyFieldEditingTemplate` for _scGenericLink_ @@ -74,13 +74,13 @@ Our versioning strategy is as follows: * `[sitecore-jss]` GenericFieldValue model is updated to accept Date type ([#1916](https://github.com/Sitecore/jss/pull/1916)) * `[template/node-xmcloud-proxy]` `[sitecore-jss-proxy]` Introduced /api/healthz endpoint ([#1928](https://github.com/Sitecore/jss/pull/1928)) * `[sitecore-jss]` `[sitecore-jss-angular]` Render field metdata chromes in editMode metadata - in edit mode metadata in Pages, angular package field directives will render wrapping `code` elements with field metadata required for editing; ([#1926](https://github.com/Sitecore/jss/pull/1926)) -* `[angular-xmcloud]``[sitecore-jss-angular]` Analytics and CloudSDK integration +* `[angular-xmcloud]` `[sitecore-jss-angular]` Analytics and CloudSDK integration * `[angular-xmcloud]` Add CloudSDK initialization on client side ([#1952](https://github.com/Sitecore/jss/pull/1952))([#1957](https://github.com/Sitecore/jss/pull/1957))([#1961](https://github.com/Sitecore/jss/pull/1961)) - * `[angular-xmcloud]``[sitecore-jss-angular]` Add CDP Page View component to Angular XM Cloud add-on ([#1957](https://github.com/Sitecore/jss/pull/1957)) -* `[templates/vue]``[sitecore-jss-vue]` Vue version has been updated to 3.5 + * `[angular-xmcloud]` `[sitecore-jss-angular]` Add CDP Page View component to Angular XM Cloud add-on ([#1957](https://github.com/Sitecore/jss/pull/1957)) +* `[templates/vue]` `[sitecore-jss-vue]` Vue version has been updated to 3.5 * `[templates/angular]` Update dependencies and proxy build path value to be unix style path to support xmcloud deployment and monorepo starter kit in xmcloud foundation head ([#1977](https://github.com/Sitecore/jss/pull/1977)) -* `[templates/angular]``[templates/angular-sxp]``[templates/angular-xmcloud]` Updates for Angular XMC sample to work well with local containers and spa-starters monorepo in xmcloud-foundation ([#1983](https://github.com/Sitecore/jss/pull/1983)) -* `[sitecore-jss-angular]``[templates/angular]` Integrate CloudSDK events firing ([#1984](https://github.com/Sitecore/jss/pull/1984))([#1990](https://github.com/Sitecore/jss/pull/1990)) +* `[templates/angular]` `[templates/angular-sxp]` `[templates/angular-xmcloud]` Updates for Angular XMC sample to work well with local containers and spa-starters monorepo in xmcloud-foundation ([#1983](https://github.com/Sitecore/jss/pull/1983)) +* `[sitecore-jss-angular]` `[templates/angular]` Integrate CloudSDK events firing ([#1984](https://github.com/Sitecore/jss/pull/1984))([#1990](https://github.com/Sitecore/jss/pull/1990)) ### 🛠 Breaking Change @@ -90,16 +90,16 @@ Our versioning strategy is as follows: * `[sitecore-jss-proxy]` Updated exports of the module for better extensibility ([#1903](https://github.com/Sitecore/jss/pull/1903)) * `express@^4.19.2` dependency is marked as a peer dependency * Default `scProxy` middleware export is replaced by `headlessProxy` object that contains the `middleware`, `ProxyConfig`, `ServerBundle` properties -* `[all packages][all samples]` Updated packages and apps to use nodejs 22. -* `[nextjs]`,`[react]``[angular]``[node-headless-ssr-proxy]` Updated `typescript` to latest version +* Update to Node.js 22 ([#1975](https://github.com/Sitecore/jss/pull/1975))([#1992](https://github.com/Sitecore/jss/pull/1992)) +* `[nextjs]` `[react]` `[angular]` `[node-headless-ssr-proxy]` Updated `typescript` to latest version * `[nextjs]` Updated `@typescript-eslint` to version 8 ### 🧹 Chores -* `[templates/angular]``[templates/node-xmcloud-proxy]``[templates/node-headless-ssr-proxy]``[templates/node-headless-ssr-experience-edge]` Adjust out of box .gitignore rules +* `[templates/angular]` `[templates/node-xmcloud-proxy]` `[templates/node-headless-ssr-proxy]` `[templates/node-headless-ssr-experience-edge]` Adjust out of box .gitignore rules * New Angular add-on's are not scaffolded within build pipeline ([#1962](https://github.com/Sitecore/jss/pull/1962)) * Release process, maintenance simplification ([#1960](https://github.com/Sitecore/jss/pull/1960)) -* `[template/angular-xmcloud]``[template/xmcloud-proxy]` Add README.md ([#1965](https://github.com/Sitecore/jss/pull/1965)) +* `[template/angular-xmcloud]` `[template/xmcloud-proxy]` Add README.md ([#1965](https://github.com/Sitecore/jss/pull/1965)) ## 22.2.2 From 56b49452d3217d9c66aad6747a32a51f3ce6f99e Mon Sep 17 00:00:00 2001 From: illiakovalenko Date: Thu, 5 Dec 2024 12:14:22 +0200 Subject: [PATCH 3/3] Updated CHANGELOG [skip ci] --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 702e188b84..de003dd9aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -90,9 +90,9 @@ Our versioning strategy is as follows: * `[sitecore-jss-proxy]` Updated exports of the module for better extensibility ([#1903](https://github.com/Sitecore/jss/pull/1903)) * `express@^4.19.2` dependency is marked as a peer dependency * Default `scProxy` middleware export is replaced by `headlessProxy` object that contains the `middleware`, `ProxyConfig`, `ServerBundle` properties -* Update to Node.js 22 ([#1975](https://github.com/Sitecore/jss/pull/1975))([#1992](https://github.com/Sitecore/jss/pull/1992)) -* `[nextjs]` `[react]` `[angular]` `[node-headless-ssr-proxy]` Updated `typescript` to latest version -* `[nextjs]` Updated `@typescript-eslint` to version 8 +* Update to Node.js 22 ([#1975](https://github.com/Sitecore/jss/pull/1975))([#1992](https://github.com/Sitecore/jss/pull/1992)): + * `[nextjs]` `[react]` `[angular]` `[node-headless-ssr-proxy]` Updated `typescript` to latest version + * `[nextjs]` Updated `@typescript-eslint` to version 8 ### 🧹 Chores