Skip to content

Commit ba751d2

Browse files
illiakovalenkoilliakovalenko
committed
Merge branch 'dev' of https://github.com/Sitecore/jss into feature/angular-xmc-proxy
2 parents 09b1b7b + 2f45b19 commit ba751d2

File tree

234 files changed

+2787
-2775
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+2787
-2775
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ Our versioning strategy is as follows:
7878

7979
* Update node/types to version 20 in all packages and samples ([#1810](https://github.com/Sitecore/jss/pull/1810))
8080
* Github - Teams integration ([#1823](https://github.com/Sitecore/jss/pull/1823))
81+
* [nextjs] Add `sharp` dependency to be in-line with nextjs's Image Optimizaion best practices: https://nextjs.org/docs/messages/install-sharp
8182

8283
## 22.0.0
8384

‎docs/upgrades/unreleased.md

+10
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,16 @@
117117
...
118118
```
119119

120+
* It's highly recommended to install `sharp` dependency version `0.32.6` for nextjs apps in order to improve memory usage of Image Optimization feature. Run the `npm` command to install it:
121+
`npm i [email protected]`
122+
123+
# nextjs-sxa
124+
125+
* The implementation for the following SXA components has been updated. Replace the existing files with updated versions.
126+
* `src/components/Image.tsx`
127+
* `src/components/Promo.tsx`
128+
* `src/components/Title.tsx`
129+
120130
# nextjs-xmcloud
121131

122132
* Render a new `EditingScripts` component in your `Scripts.ts` file to support a new Editing Integration feature.

‎lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"lerna": "3.22.1",
33
"packages": ["packages/*", "samples/*"],
4-
"version": "22.1.0-canary.65",
4+
"version": "22.1.0-canary.66",
55
"npmClient": "yarn",
66
"useWorkspaces": true
77
}

‎packages/create-sitecore-jss/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-sitecore-jss",
3-
"version": "22.1.0-canary.65",
3+
"version": "22.1.0-canary.66",
44
"description": "Sitecore JSS initializer",
55
"bin": "./dist/index.js",
66
"scripts": {

‎packages/create-sitecore-jss/src/templates/angular/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"@apollo/client": "^3.3.12",
5858
"@ngx-translate/core": "~15.0.0",
5959
"@ngx-translate/http-loader": "~8.0.0",
60-
"@sitecore-jss/sitecore-jss-angular": "~22.0.0",
60+
"@sitecore-jss/sitecore-jss-angular": "~22.1.0-canary",
6161
"apollo-angular": "~6.0.0",
6262
"bootstrap": "^5.3.3",
6363
"core-js": "~3.37.1",
@@ -78,9 +78,9 @@
7878
"@angular/cli": "~17.3.8",
7979
"@angular/compiler-cli": "~17.3.11",
8080
"@angular/language-service": "~17.3.11",
81-
"@sitecore-jss/sitecore-jss-angular-schematics": "~22.0.0",
82-
"@sitecore-jss/sitecore-jss-cli": "~22.0.0",
83-
"@sitecore-jss/sitecore-jss-dev-tools": "~22.0.0",
81+
"@sitecore-jss/sitecore-jss-angular-schematics": "~22.1.0-canary",
82+
"@sitecore-jss/sitecore-jss-cli": "~22.1.0-canary",
83+
"@sitecore-jss/sitecore-jss-dev-tools": "~22.1.0-canary",
8484
"@types/isomorphic-fetch": "0.0.35",
8585
"@types/jasmine": "~3.6.7",
8686
"@types/jasminewd2": "~2.0.8",

‎packages/create-sitecore-jss/src/templates/nextjs/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
"next": "^14.1.0",
3232
"next-localization": "^0.12.0",
3333
"react": "^18.2.0",
34-
"react-dom": "^18.2.0"
34+
"react-dom": "^18.2.0",
35+
"sharp": "0.32.6"
3536
},
3637
"devDependencies": {
3738
"@graphql-codegen/cli": "^5.0.0",

‎packages/sitecore-jss-angular-schematics/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sitecore-jss/sitecore-jss-angular-schematics",
3-
"version": "22.1.0-canary.65",
3+
"version": "22.1.0-canary.66",
44
"description": "Scaffolding schematics for Sitecore JSS Angular apps",
55
"scripts": {
66
"build": "tsc -p tsconfig.json",

‎packages/sitecore-jss-angular/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sitecore-jss/sitecore-jss-angular",
3-
"version": "22.1.0-canary.65",
3+
"version": "22.1.0-canary.66",
44
"description": "",
55
"scripts": {
66
"build": "ng-packagr -p ng-package.json",
@@ -58,7 +58,7 @@
5858
"rxjs": "~7.8.1"
5959
},
6060
"dependencies": {
61-
"@sitecore-jss/sitecore-jss": "22.1.0-canary.65"
61+
"@sitecore-jss/sitecore-jss": "22.1.0-canary.66"
6262
},
6363
"main": "dist/esm2022/sitecore-jss-sitecore-jss-angular.mjs",
6464
"module": "dist/esm2022/sitecore-jss-sitecore-jss-angular.js",

‎packages/sitecore-jss-cli/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sitecore-jss/sitecore-jss-cli",
3-
"version": "22.1.0-canary.65",
3+
"version": "22.1.0-canary.66",
44
"description": "Sitecore JSS command-line",
55
"main": "dist/cjs/cli.js",
66
"module": "dist/esm/cli.js",
@@ -32,7 +32,7 @@
3232
"url": "https://github.com/sitecore/jss/issues"
3333
},
3434
"dependencies": {
35-
"@sitecore-jss/sitecore-jss-dev-tools": "22.1.0-canary.65",
35+
"@sitecore-jss/sitecore-jss-dev-tools": "22.1.0-canary.66",
3636
"chalk": "^4.1.2",
3737
"cross-spawn": "^7.0.3",
3838
"dotenv": "^16.0.3",

‎packages/sitecore-jss-dev-tools/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sitecore-jss/sitecore-jss-dev-tools",
3-
"version": "22.1.0-canary.65",
3+
"version": "22.1.0-canary.66",
44
"description": "Utilities to assist in the development and deployment of Sitecore JSS apps.",
55
"main": "dist/cjs/index.js",
66
"module": "dist/esm/index.js",
@@ -33,7 +33,7 @@
3333
},
3434
"dependencies": {
3535
"@babel/parser": "^7.24.0",
36-
"@sitecore-jss/sitecore-jss": "22.1.0-canary.65",
36+
"@sitecore-jss/sitecore-jss": "22.1.0-canary.66",
3737
"axios": "^1.3.2",
3838
"chalk": "^4.1.2",
3939
"chokidar": "^3.6.0",

‎packages/sitecore-jss-forms/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sitecore-jss/sitecore-jss-forms",
3-
"version": "22.1.0-canary.65",
3+
"version": "22.1.0-canary.66",
44
"main": "dist/cjs/index.js",
55
"module": "dist/esm/index.js",
66
"sideEffects": false,
@@ -43,7 +43,7 @@
4343
"typescript": "~4.9.5"
4444
},
4545
"dependencies": {
46-
"@sitecore-jss/sitecore-jss": "22.1.0-canary.65"
46+
"@sitecore-jss/sitecore-jss": "22.1.0-canary.66"
4747
},
4848
"description": "",
4949
"types": "types/index.d.ts",

‎packages/sitecore-jss-nextjs/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sitecore-jss/sitecore-jss-nextjs",
3-
"version": "22.1.0-canary.65",
3+
"version": "22.1.0-canary.66",
44
"main": "dist/cjs/index.js",
55
"module": "dist/esm/index.js",
66
"sideEffects": false,
@@ -72,9 +72,9 @@
7272
"react-dom": "^18.2.0"
7373
},
7474
"dependencies": {
75-
"@sitecore-jss/sitecore-jss": "22.1.0-canary.65",
76-
"@sitecore-jss/sitecore-jss-dev-tools": "22.1.0-canary.65",
77-
"@sitecore-jss/sitecore-jss-react": "22.1.0-canary.65",
75+
"@sitecore-jss/sitecore-jss": "22.1.0-canary.66",
76+
"@sitecore-jss/sitecore-jss-dev-tools": "22.1.0-canary.66",
77+
"@sitecore-jss/sitecore-jss-react": "22.1.0-canary.66",
7878
"@vercel/kv": "^0.2.1",
7979
"prop-types": "^15.8.1",
8080
"regex-parser": "^2.2.11",

‎packages/sitecore-jss-proxy/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sitecore-jss/sitecore-jss-proxy",
3-
"version": "22.1.0-canary.65",
3+
"version": "22.1.0-canary.66",
44
"description": "Proxy middleware for express.js server.",
55
"main": "dist/cjs/index.js",
66
"module": "dist/esm/index.js",

‎packages/sitecore-jss-react-forms/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sitecore-jss/sitecore-jss-react-forms",
3-
"version": "22.1.0-canary.65",
3+
"version": "22.1.0-canary.66",
44
"main": "dist/cjs/index.js",
55
"module": "dist/esm/index.js",
66
"sideEffects": false,
@@ -54,7 +54,7 @@
5454
"react-dom": "^18.2.0"
5555
},
5656
"dependencies": {
57-
"@sitecore-jss/sitecore-jss-forms": "22.1.0-canary.65",
57+
"@sitecore-jss/sitecore-jss-forms": "22.1.0-canary.66",
5858
"prop-types": "^15.8.1"
5959
},
6060
"description": "",

‎packages/sitecore-jss-react-native/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sitecore-jss/sitecore-jss-react-native",
3-
"version": "22.1.0-canary.65",
3+
"version": "22.1.0-canary.66",
44
"description": "",
55
"main": "dist/index.js",
66
"scripts": {
@@ -27,7 +27,7 @@
2727
"url": "https://github.com/sitecore/jss/issues"
2828
},
2929
"dependencies": {
30-
"@sitecore-jss/sitecore-jss": "22.1.0-canary.65",
30+
"@sitecore-jss/sitecore-jss": "22.1.0-canary.66",
3131
"prop-types": "^15.7.2",
3232
"react-native-htmlview": "^0.15.0",
3333
"react-native-svg": "^5.3.0",

‎packages/sitecore-jss-react/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sitecore-jss/sitecore-jss-react",
3-
"version": "22.1.0-canary.65",
3+
"version": "22.1.0-canary.66",
44
"main": "dist/cjs/index.js",
55
"module": "dist/esm/index.js",
66
"sideEffects": false,
@@ -61,7 +61,7 @@
6161
"react-dom": "^18.2.0"
6262
},
6363
"dependencies": {
64-
"@sitecore-jss/sitecore-jss": "22.1.0-canary.65",
64+
"@sitecore-jss/sitecore-jss": "22.1.0-canary.66",
6565
"fast-deep-equal": "^3.1.3",
6666
"prop-types": "^15.8.1",
6767
"style-attr": "^1.3.0"

‎packages/sitecore-jss-rendering-host/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sitecore-jss/sitecore-jss-rendering-host",
3-
"version": "22.1.0-canary.65",
3+
"version": "22.1.0-canary.66",
44
"main": "dist/cjs/index.js",
55
"module": "dist/esm/index.js",
66
"sideEffects": false,

‎packages/sitecore-jss-vue/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sitecore-jss/sitecore-jss-vue",
3-
"version": "22.1.0-canary.65",
3+
"version": "22.1.0-canary.66",
44
"description": "A library for building Sitecore JSS apps using Vue.js",
55
"main": "dist/cjs/index.js",
66
"module": "dist/esm/index.js",
@@ -48,7 +48,7 @@
4848
"vue": "^3.2.45"
4949
},
5050
"dependencies": {
51-
"@sitecore-jss/sitecore-jss": "22.1.0-canary.65",
51+
"@sitecore-jss/sitecore-jss": "22.1.0-canary.66",
5252
"@vue/compiler-sfc": "^3.0.11"
5353
},
5454
"types": "./types/index.d.ts",

‎packages/sitecore-jss/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sitecore-jss/sitecore-jss",
3-
"version": "22.1.0-canary.65",
3+
"version": "22.1.0-canary.66",
44
"main": "dist/cjs/index.js",
55
"module": "dist/esm/index.js",
66
"sideEffects": false,

‎ref-docs/sitecore-jss-angular-schematics/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@
3838

3939
#### Defined in
4040

41-
[index.ts:41](https://github.com/Sitecore/jss/blob/c15461c05/packages/sitecore-jss-angular-schematics/src/jss-component/index.ts#L41)
41+
[index.ts:41](https://github.com/Sitecore/jss/blob/f1a949104/packages/sitecore-jss-angular-schematics/src/jss-component/index.ts#L41)

‎ref-docs/sitecore-jss-angular/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ packages/sitecore-jss/types/editing/edit-frame.d.ts:57
234234

235235
#### Defined in
236236

237-
[packages/sitecore-jss-angular/src/services/placeholder.token.ts:65](https://github.com/Sitecore/jss/blob/c15461c05/packages/sitecore-jss-angular/src/services/placeholder.token.ts#L65)
237+
[packages/sitecore-jss-angular/src/services/placeholder.token.ts:65](https://github.com/Sitecore/jss/blob/f1a949104/packages/sitecore-jss-angular/src/services/placeholder.token.ts#L65)
238238

239239
___
240240

@@ -443,7 +443,7 @@ rendering is HtmlElementRendering
443443

444444
#### Defined in
445445

446-
[packages/sitecore-jss-angular/src/components/rendering.ts:6](https://github.com/Sitecore/jss/blob/c15461c05/packages/sitecore-jss-angular/src/components/rendering.ts#L6)
446+
[packages/sitecore-jss-angular/src/components/rendering.ts:6](https://github.com/Sitecore/jss/blob/f1a949104/packages/sitecore-jss-angular/src/components/rendering.ts#L6)
447447

448448
___
449449

‎ref-docs/sitecore-jss-angular/classes/ComponentNameAndType.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Registers a statically loaded component
3131

3232
#### Defined in
3333

34-
[packages/sitecore-jss-angular/src/services/placeholder.token.ts:12](https://github.com/Sitecore/jss/blob/c15461c05/packages/sitecore-jss-angular/src/services/placeholder.token.ts#L12)
34+
[packages/sitecore-jss-angular/src/services/placeholder.token.ts:12](https://github.com/Sitecore/jss/blob/f1a949104/packages/sitecore-jss-angular/src/services/placeholder.token.ts#L12)
3535

3636
___
3737

@@ -41,7 +41,7 @@ ___
4141

4242
#### Defined in
4343

44-
[packages/sitecore-jss-angular/src/services/placeholder.token.ts:9](https://github.com/Sitecore/jss/blob/c15461c05/packages/sitecore-jss-angular/src/services/placeholder.token.ts#L9)
44+
[packages/sitecore-jss-angular/src/services/placeholder.token.ts:9](https://github.com/Sitecore/jss/blob/f1a949104/packages/sitecore-jss-angular/src/services/placeholder.token.ts#L9)
4545

4646
___
4747

@@ -55,7 +55,7 @@ ___
5555

5656
#### Defined in
5757

58-
[packages/sitecore-jss-angular/src/services/placeholder.token.ts:17](https://github.com/Sitecore/jss/blob/c15461c05/packages/sitecore-jss-angular/src/services/placeholder.token.ts#L17)
58+
[packages/sitecore-jss-angular/src/services/placeholder.token.ts:17](https://github.com/Sitecore/jss/blob/f1a949104/packages/sitecore-jss-angular/src/services/placeholder.token.ts#L17)
5959

6060
___
6161

@@ -65,4 +65,4 @@ ___
6565

6666
#### Defined in
6767

68-
[packages/sitecore-jss-angular/src/services/placeholder.token.ts:10](https://github.com/Sitecore/jss/blob/c15461c05/packages/sitecore-jss-angular/src/services/placeholder.token.ts#L10)
68+
[packages/sitecore-jss-angular/src/services/placeholder.token.ts:10](https://github.com/Sitecore/jss/blob/f1a949104/packages/sitecore-jss-angular/src/services/placeholder.token.ts#L10)

0 commit comments

Comments
 (0)