Sitecore · sumon1991 · Sep 28, 2022 · Sep 28, 2022 · Sep 29, 2022 · Sep 30, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,56 @@ All notable changes to this project will be documented in this file. The format
 
 This project does NOT adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), and major versions of this project denote compatibility with Sitecore Platform versions. Refer to the "Headless Services" section in the [Sitecore modules compatibility table](https://support.sitecore.com/kb?id=kb_article_view&sysparm_article=KB1000576) or the [Headless Rendering download page](https://dev.sitecore.net/Downloads/Sitecore_Headless_Rendering.aspx) for more details on versioning.
 
+## 20.3.2
+
+### 🐛 Bug Fixes
+
+* `[sitecore-jss]` Handle null items in graphql layout service ([#1771](https://github.com/Sitecore/jss/pull/1771))
+
+## 20.3.1
+
+### 🐛 Bug Fixes
+
+* `[sitecore-jss]` Export _ClientError_ type ([#1738](https://github.com/Sitecore/jss/pull/1738))
+* `[templates/nextjs]` `[sitecore-jss-nextjs]` Better error handling for component-level data fetching ([#1586](https://github.com/Sitecore/jss/pull/1586))
+* `[sitecore-jss]` Enable the Layout, dictionary and Error Page service to use custom `retryStrategy`. ([#1749](https://github.com/Sitecore/jss/pull/1749))
+
+
+## 20.3.0
+
+### 🎉 New Features & Improvements
+
+* `[sitecore-jss]` Retry policy to handle transient network errors. Users can pass `retryStrategy` to configure custom retry config to the services. They can customize the error codes and the number of retries. It consist of two functions shouldRetry and getDelay. To determine the back-off time, we employ an exponential strategy with a default factor of 2.([#1731](https://github.com/Sitecore/jss/pull/1731)) ([#1733](https://github.com/Sitecore/jss/pull/1733))
+
+## 20.2.3
+
+### 🐛 Bug Fixes
+
+* `[sitecore-jss-react]` `[sitecore-jss-nextjs]` Link component does not add anchor to the internal links ([#1226](https://github.com/Sitecore/jss/pull/1226))
+
+## 20.2.2
+
+### 🧹 Chores
+
+* `[create-sitecore-jss]` This is a maintenance release to fix package versioning in JSS templates.
+
+## 20.2.1
+
+### 🧹 Chores
+
+* `[create-sitecore-jss]` This is a maintenance release to fix package versioning in JSS templates.
+
+## 20.2.0
+
+### 🎉 New Features & Improvements
+
+* `[sitecore-jss]` `[templates/nextjs]` GraphQL Layout and Dictionary services can handle endpoint rate limits through retryer functionality in GraphQLClient. To prevent SSG builds from failing and enable multiple retries, set retry amount in lib/dictionary-service-factory and lib/layout-service-factory ([commit](https://github.com/Sitecore/jss/pull/1631/commits/d39d74ad7bbeddcb66b7de4377070e178851abc5))([#1631](https://github.com/Sitecore/jss/pull/1631)) 
+* `[sitecore-jss-nextjs]` Reduce the amount of Edge API calls during fetch getStaticPaths ([commit](https://github.com/Sitecore/jss/pull/1631/commits/cd2771b256ac7c38818ee6bea48278958ac455ca))([#1631](https://github.com/Sitecore/jss/pull/1631))
+
+### 🐛 Bug Fixes
+
+* `[sitecore-jss-proxy]` Setting "followRedirects" to "true" breaks HEAD requests ([#1630](https://github.com/Sitecore/jss/pull/1635))
+
 ## 20.1.0
 
 ### 🎉 New Features & Improvements

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -83,7 +83,7 @@ steps:
   #
 - script: |
     echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > .npmrc
-    $(npm bin)/lerna publish from-git --canary --pre-dist-tag ver20 --preid canary --no-verify-access --yes
+    $(npm bin)/lerna publish from-git --canary --pre-dist-tag ver20-canary --preid canary --no-verify-access --yes
     yarn install --no-immutable --mode=update-lockfile
     git add yarn.lock
     git commit -m "update yarn.lock [skip ci]"

diff --git a/lerna.json b/lerna.json
@@ -4,7 +4,7 @@
     "packages/*",
     "samples/*"
   ],
-  "version": "20.1.0",
+  "version": "20.3.3",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/packages/create-sitecore-jss/package.json b/packages/create-sitecore-jss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-sitecore-jss",
-  "version": "20.1.0",
+  "version": "20.3.3",
   "description": "Sitecore JSS initializer",
   "bin": "./dist/index.js",
   "scripts": {

diff --git a/packages/create-sitecore-jss/src/initializers/nextjs/index.ts b/packages/create-sitecore-jss/src/initializers/nextjs/index.ts
@@ -43,7 +43,8 @@ export default class NextjsInitializer implements Initializer {
             value: 'nextjs-styleguide',
           },
           {
-            name: 'nextjs-sxa - Includes example components and setup for working using SXA',
+            name:
+              'nextjs-sxa - Includes example components and setup for SXA Headless (only compatible with Sitecore XM Cloud)',
             value: 'nextjs-sxa',
           },
         ],

diff --git a/packages/create-sitecore-jss/src/templates/angular/package.json b/packages/create-sitecore-jss/src/templates/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "<%- appName %>",
-  "version": "20.1.0",
+  "version": "20.3.3",
   "description": "Application utilizing Sitecore JavaScript Services and Angular (angular-cli).",
   "config": {
     "appName": "<%- appName %>",
@@ -63,8 +63,8 @@
     "@apollo/client": "^3.3.12",
     "@ngx-translate/core": "~13.0.0",
     "@ngx-translate/http-loader": "~6.0.0",
-    "@sitecore-jss/sitecore-jss": "^20.1.0",
-    "@sitecore-jss/sitecore-jss-angular": "^20.1.0",
+    "@sitecore-jss/sitecore-jss": "^20.3.3",
+    "@sitecore-jss/sitecore-jss-angular": "^20.3.3",
     "apollo-angular": "~2.4.0",
     "bootstrap": "^4.3.1",
     "core-js": "~3.9.1",
@@ -86,9 +86,9 @@
     "@angular/cli": "~11.2.5",
     "@angular/compiler-cli": "~11.2.6",
     "@angular/language-service": "~11.2.6",
-    "@sitecore-jss/sitecore-jss-angular-schematics": "^20.1.0",
-    "@sitecore-jss/sitecore-jss-cli": "^20.1.0",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^20.1.0",
+    "@sitecore-jss/sitecore-jss-angular-schematics": "^20.3.3",
+    "@sitecore-jss/sitecore-jss-cli": "^20.3.3",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^20.3.3",
     "@types/isomorphic-fetch": "0.0.35",
     "@types/jasmine": "~3.6.7",
     "@types/jasminewd2": "~2.0.8",

diff --git a/packages/create-sitecore-jss/src/templates/nextjs-styleguide/package.json b/packages/create-sitecore-jss/src/templates/nextjs-styleguide/package.json
@@ -4,11 +4,11 @@
     "nprogress": "~0.2.0"
   },
   "devDependencies": {
-    "@sitecore-jss/sitecore-jss-dev-tools": "^20.1.0",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^20.3.3",
     "@types/nprogress": "^0.2.0"
   },
   "scripts": {
     "start": "cross-env-shell JSS_MODE=disconnected \"npm-run-all --serial bootstrap --parallel next:dev start:disconnected-proxy start:watch-components\"",
     "start:disconnected-proxy": "ts-node --project tsconfig.scripts.json ./scripts/disconnected-mode-proxy.ts"
   }
-}
+}
diff --git a/...e-sitecore-jss/src/templates/nextjs-sxa/src/lib/page-props-factory/plugins/error-pages.ts b/...e-sitecore-jss/src/templates/nextjs-sxa/src/lib/page-props-factory/plugins/error-pages.ts
@@ -14,6 +14,10 @@ class ErrorPagesPlugin implements Plugin {
       apiKey: config.sitecoreApiKey,
       siteName: config.jssAppName,
       language: props.locale,
+      retries:
+        (process.env.GRAPH_QL_SERVICE_RETRIES &&
+          parseInt(process.env.GRAPH_QL_SERVICE_RETRIES, 10)) ||
+        0,
     });
 
     if (props.notFound) {

diff --git a/packages/create-sitecore-jss/src/templates/nextjs/.env b/packages/create-sitecore-jss/src/templates/nextjs/.env
@@ -36,6 +36,9 @@ SITECORE_API_HOST=
 # the resolved Sitecore API hostname + the `graphQLEndpointPath` defined in your `package.json`.
 GRAPH_QL_ENDPOINT=
 
+# How many times should GraphQL Layout, Dictionary and ErrorPages services retry a fetch when endpoint rate limit is reached
+GRAPH_QL_SERVICE_RETRIES=0
+
 # The way in which layout and dictionary data is fetched from Sitecore
 FETCH_WITH=<%- fetchWith %>
 

diff --git a/packages/create-sitecore-jss/src/templates/nextjs/package.json b/packages/create-sitecore-jss/src/templates/nextjs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "<%- appName %>",
   "description": "Application utilizing Sitecore JavaScript Services and Next.js",
-  "version": "20.1.0",
+  "version": "20.3.3",
   "private": true,
   "config": {
     "appName": "<%- appName %>",
@@ -29,7 +29,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@sitecore-jss/sitecore-jss-nextjs": "ver20",
+    "@sitecore-jss/sitecore-jss-nextjs": "^20.3.3",
     "graphql": "~15.8.0",
     "graphql-tag": "^2.11.0",
     "next": "^12.2.4",
@@ -45,7 +45,7 @@
     "@graphql-codegen/typescript-operations": "^1.17.9",
     "@graphql-codegen/typescript-resolvers": "^1.17.10",
     "@graphql-typed-document-node/core": "^3.1.0",
-    "@sitecore-jss/sitecore-jss-cli": "^20.1.0",
+    "@sitecore-jss/sitecore-jss-cli": "^20.3.3",
     "@types/node": "^14.6.4",
     "@types/react": "^17.0.15",
     "@types/react-dom": "^17.0.9",

diff --git a/packages/create-sitecore-jss/src/templates/nextjs/src/lib/dictionary-service-factory.ts b/packages/create-sitecore-jss/src/templates/nextjs/src/lib/dictionary-service-factory.ts
@@ -18,6 +18,20 @@ export class DictionaryServiceFactory {
             otherwise, the service will attempt to figure out the root item for the current JSS App using GraphQL and app name.
             rootItemId: '{GUID}'
           */
+          /*
+            GraphQL endpoint may reach its rate limit with the amount of requests it receives and throw a rate limit error.
+            GraphQL Dictionary and Layout Services can handle rate limit errors from server and attempt a retry on requests.
+            For this, specify the number of 'retries' the GraphQL client will attempt.
+            It will only try the request once by default.
+
+            Additionally, you have the flexibility to customize the retry strategy by passing a 'retryStrategy'.
+            By default it uses the `DefaultRetryStrategy` with exponential back-off factor of 2 for error codes 429,
+            502, 503, 504, 520, 521, 522, 523, and 524. You can use this class or your own implementation of `RetryStrategy`.
+          */
+          retries:
+            (process.env.GRAPH_QL_SERVICE_RETRIES &&
+              parseInt(process.env.GRAPH_QL_SERVICE_RETRIES, 10)) ||
+            0,
         })
       : new RestDictionaryService({
           apiHost: config.sitecoreApiHost,

diff --git a/packages/create-sitecore-jss/src/templates/nextjs/src/lib/layout-service-factory.ts b/packages/create-sitecore-jss/src/templates/nextjs/src/lib/layout-service-factory.ts
@@ -12,6 +12,20 @@ export class LayoutServiceFactory {
           endpoint: config.graphQLEndpoint,
           apiKey: config.sitecoreApiKey,
           siteName: config.jssAppName,
+          /*
+            GraphQL endpoint may reach its rate limit with the amount of requests it receives and throw a rate limit error.
+            GraphQL Dictionary and Layout Services can handle rate limit errors from server and attempt a retry on requests.
+            For this, specify the number of 'retries' the GraphQL client will attempt.
+            It will only try the request once by default.
+
+            Additionally, you have the flexibility to customize the retry strategy by passing a 'retryStrategy'.
+            By default it uses the `DefaultRetryStrategy` with exponential back-off factor of 2 for error codes 429,
+            502, 503, 504, 520, 521, 522, 523, and 524. You can use this class or your own implementation of `RetryStrategy`.
+          */
+          retries:
+            (process.env.GRAPH_QL_SERVICE_RETRIES &&
+              parseInt(process.env.GRAPH_QL_SERVICE_RETRIES, 10)) ||
+            0,
         })
       : new RestLayoutService({
           apiHost: config.sitecoreApiHost,

diff --git a/...e-sitecore-jss/src/templates/nextjs/src/lib/page-props-factory/plugins/component-props.ts b/...e-sitecore-jss/src/templates/nextjs/src/lib/page-props-factory/plugins/component-props.ts
@@ -1,4 +1,4 @@
-import { ComponentPropsService } from '@sitecore-jss/sitecore-jss-nextjs';
+import { ComponentPropsService, ComponentPropsError } from '@sitecore-jss/sitecore-jss-nextjs';
 import { SitecorePageProps } from 'lib/page-props';
 import { GetServerSidePropsContext, GetStaticPropsContext } from 'next';
 import { componentModule } from 'temp/componentFactory';
@@ -31,6 +31,20 @@ class ComponentPropsPlugin implements Plugin {
       });
     }
 
+    const errors = Object.keys(props.componentProps)
+      .map(id => {
+        const component = props.componentProps[id] as ComponentPropsError;
+
+        return component.error
+          ? `\nUnable to get component props for ${component.componentName} (${id}): ${component.error}`
+          : '';
+      })
+      .join('');
+
+    if (errors.length) {
+      throw new Error(errors);
+    }
+
     return props;
   }
 }

diff --git a/packages/create-sitecore-jss/src/templates/node-headless-ssr-experience-edge/package.json b/packages/create-sitecore-jss/src/templates/node-headless-ssr-experience-edge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-headless-ssr-experience-edge-sample",
-  "version": "20.1.0",
+  "version": "20.3.3",
   "description": "Node server-side-rendering sample for running JSS apps under Node hosting using Experience Edge",
   "main": "index.js",
   "scripts": {
@@ -24,7 +24,7 @@
   "homepage": "https://jss.sitecore.com",
   "license": "Apache-2.0",
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^20.1.0",
+    "@sitecore-jss/sitecore-jss": "^20.3.3",
     "compression": "^1.7.4",
     "express": "^4.17.1"
   },

diff --git a/packages/create-sitecore-jss/src/templates/node-headless-ssr-proxy/package.json b/packages/create-sitecore-jss/src/templates/node-headless-ssr-proxy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-headless-ssr-proxy-sample",
-  "version": "20.1.0",
+  "version": "20.3.3",
   "description": "Node server-side-rendering proxy sample for running JSS apps under Node hosting",
   "main": "dist/index.js",
   "scripts": {
@@ -24,8 +24,8 @@
   "homepage": "https://jss.sitecore.com",
   "license": "Apache-2.0",
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^20.1.0",
-    "@sitecore-jss/sitecore-jss-proxy": "^20.1.0",
+    "@sitecore-jss/sitecore-jss": "^20.3.3",
+    "@sitecore-jss/sitecore-jss-proxy": "^20.3.3",
     "agentkeepalive": "^4.1.3",
     "compression": "~1.7.3",
     "express": "~4.16.4",

diff --git a/packages/create-sitecore-jss/src/templates/react-native/package.json b/packages/create-sitecore-jss/src/templates/react-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "<%- appName %>",
-  "version": "20.1.0",
+  "version": "20.3.3",
   "description": "A basic React Native app utilizing Sitecore JavaScript Services",
   "config": {
     "appName": "<%- appName %>",
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@react-native-community/masked-view": "^0.1.10",
-    "@sitecore-jss/sitecore-jss-react-native": "^20.1.0",
+    "@sitecore-jss/sitecore-jss-react-native": "^20.3.3",
     "prop-types": "^15.6.0",
     "react": "16.13.1",
     "react-native": "^0.63.4",
@@ -41,8 +41,8 @@
   },
   "private": true,
   "devDependencies": {
-    "@sitecore-jss/sitecore-jss-cli": "^20.1.0",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^20.1.0",
+    "@sitecore-jss/sitecore-jss-cli": "^20.3.3",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^20.3.3",
     "babel-core": "^6.26.0",
     "babel-eslint": "^8.2.1",
     "babel-plugin-inline-replace-variables": "^1.3.1",

diff --git a/packages/create-sitecore-jss/src/templates/react/package.json b/packages/create-sitecore-jss/src/templates/react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "<%- appName %>",
   "description": "Application utilizing Sitecore JavaScript Services and React (create-react-app).",
-  "version": "20.1.0",
+  "version": "20.3.3",
   "private": true,
   "config": {
     "appName": "<%- appName %>",
@@ -32,7 +32,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@apollo/client": "^3.5.6",
-    "@sitecore-jss/sitecore-jss-react": "^20.1.0",
+    "@sitecore-jss/sitecore-jss-react": "^20.3.3",
     "axios": "^0.21.1",
     "bootstrap": "^4.3.1",
     "cross-fetch": "^3.0.6",
@@ -54,9 +54,9 @@
     "@babel/core": "^7.16.0",
     "@babel/preset-env": "^7.10.4",
     "@babel/register": "~7.6.2",
-    "@sitecore-jss/sitecore-jss-cli": "^20.1.0",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^20.1.0",
-    "@sitecore-jss/sitecore-jss-rendering-host": "^20.1.0",
+    "@sitecore-jss/sitecore-jss-cli": "^20.3.3",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^20.3.3",
+    "@sitecore-jss/sitecore-jss-rendering-host": "^20.3.3",
     "babel-eslint": "^10.1.0",
     "babel-loader": "8.1.0",
     "babel-preset-react-app": "~9.0.2",

diff --git a/packages/create-sitecore-jss/src/templates/vue/.eslintrc.js b/packages/create-sitecore-jss/src/templates/vue/.eslintrc.js
@@ -8,8 +8,11 @@ module.exports = {
   rules: {
     'no-console': 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'vue/multi-word-component-names': 'off',
   },
   parserOptions: {
-    parser: 'babel-eslint',
+    parser: '@babel/eslint-parser',
+    ecmaVersion: 8,
+    requireConfigFile: false,
   },
 };