Merge release/14.0.0 into dev (#422)

* Fix bug #349 typings for Placeholder prop functions render, renderEach, renderEmpty (#350)

* Fixes withSitecoreContext typescript definition (#347)

* v14.0.0

* [React sample] Cannot read property 'fields' of undefined

* [React sample] version fix

* v14.0.1

* [Doc] Remove mentioning that Sitecore JSS Forms are not working in headless mode + provide workaround

Author: sc-illiakovalenko

lerna.json

@@ -4,5 +4,5 @@
     "packages/*",
     "samples/*"
   ],
-  "version": "13.2.0"
+  "version": "14.0.1"
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-angular-schematics",
-  "version": "13.2.0",
+  "version": "14.0.1",
   "description": "Scaffolding schematics for Sitecore JSS Angular apps",
   "scripts": {
     "build": "tsc -p tsconfig.json",

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

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-angular",
-  "version": "13.2.0",
+  "version": "14.0.1",
   "description": "",
   "scripts": {
     "build": "ng-packagr -p ng-package.json",
@@ -51,7 +51,7 @@
     "rxjs": "^6.5.3"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^13.2.0"
+    "@sitecore-jss/sitecore-jss": "^14.0.1"
   },
   "main": "dist/bundles/sitecore-jss-sitecore-jss-angular.umd.js",
   "module": "dist/esm5/sitecore-jss-sitecore-jss-angular.js",

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

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-cli",
-  "version": "13.2.0",
+  "version": "14.0.1",
   "description": "Sitecore JSS command-line",
   "scripts": {
     "build": "npm run clean && tsc",
@@ -30,8 +30,8 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss-dev-tools": "^13.2.0",
-    "@sitecore-jss/sitecore-jss-manifest": "^13.2.0",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^14.0.1",
+    "@sitecore-jss/sitecore-jss-manifest": "^14.0.1",
     "chalk": "^2.4.2",
     "cross-spawn": "^7.0.0",
     "fs-extra": "^8.1.0",

packages/sitecore-jss-angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-dev-tools",
-  "version": "13.2.0",
+  "version": "14.0.1",
   "description": "Utilities to assist in the development and deployment of Sitecore JSS apps.",
   "scripts": {
     "build": "npm run clean && tsc",
@@ -29,9 +29,9 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^13.2.0",
-    "@sitecore-jss/sitecore-jss-manifest": "^13.2.0",
-    "@sitecore-jss/sitecore-jss-update-package": "^13.2.0",
+    "@sitecore-jss/sitecore-jss": "^14.0.1",
+    "@sitecore-jss/sitecore-jss-manifest": "^14.0.1",
+    "@sitecore-jss/sitecore-jss-update-package": "^14.0.1",
     "chokidar": "^3.2.1",
     "del": "^5.1.0",
     "express": "^4.17.1",

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

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-forms",
-  "version": "13.2.0",
+  "version": "14.0.1",
   "main": "dist/index.js",
   "scripts": {
     "build": "npm run clean && tsc",
@@ -42,7 +42,7 @@
     "typescript": "^3.6.3"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^13.2.0"
+    "@sitecore-jss/sitecore-jss": "^14.0.1"
   },
   "description": "",
   "types": "types/index.d.ts",

packages/sitecore-jss-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-manifest",
-  "version": "13.2.0",
+  "version": "14.0.1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -25,8 +25,8 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^13.2.0",
-    "@sitecore-jss/sitecore-pipelines": "^13.2.0",
+    "@sitecore-jss/sitecore-jss": "^14.0.1",
+    "@sitecore-jss/sitecore-pipelines": "^14.0.1",
     "fs-extra": "^8.1.0",
     "glob": "^7.1.4",
     "import-fresh": "^3.1.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-proxy",
-  "version": "13.2.0",
+  "version": "14.0.1",
   "description": "Proxy middleware for express.js server.",
   "main": "dist/index.js",
   "scripts": {

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

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-react-forms",
-  "version": "13.2.0",
+  "version": "14.0.1",
   "main": "dist/index.js",
   "scripts": {
     "build": "npm run clean && tsc",
@@ -49,7 +49,7 @@
     "react-dom": "^16.10.2"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss-forms": "^13.2.0",
+    "@sitecore-jss/sitecore-jss-forms": "^14.0.1",
     "prop-types": "^15.7.2"
   },
   "description": "",

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

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-react-native",
-  "version": "13.2.0",
+  "version": "14.0.1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -26,7 +26,7 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^13.2.0",
+    "@sitecore-jss/sitecore-jss": "^14.0.1",
     "prop-types": "^15.7.2",
     "react-native-htmlview": "^0.15.0",
     "react-native-svg": "^9.13.2",

packages/sitecore-jss-forms/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-react",
-  "version": "13.2.0",
+  "version": "14.0.1",
   "main": "dist/index.js",
   "scripts": {
     "build": "npm run clean && tsc",
@@ -56,7 +56,7 @@
     "react-dom": "^16.9.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^13.2.0",
+    "@sitecore-jss/sitecore-jss": "^14.0.1",
     "prop-types": "^15.7.2",
     "style-attr": "^1.3.0"
   },

packages/sitecore-jss-manifest/package-lock.json

@@ -15,7 +15,7 @@ const componentFactory: ComponentFactory = (componentName: string) => {
   const components = new Map<string, any>();
 
   // pass otherProps to page-content to test property cascading through the Placeholder
-  const Home: React.SFC<any> = ({ rendering, ...otherProps }) => (
+  const Home: React.SFC<any> = ({ rendering, render, renderEach, renderEmpty, ...otherProps }) => (
     <div className="home-mock">
       <Placeholder name="page-header" rendering={rendering} />
       <Placeholder name="page-content" rendering={rendering} {...otherProps} />
@@ -85,6 +85,90 @@ describe('<Placeholder />', () => {
         expect(renderedComponent.find('.download-callout-mock').length).to.equal(1);
       });
 
+      it('should render components based on the rendereach function', () => {
+        const component: any = dataSet.data.sitecore.route;
+        const phKey = 'main';
+
+        const renderedComponent = mount(
+          <SitecoreContext componentFactory={componentFactory}>
+            <Placeholder
+              name={phKey}
+              rendering={component}
+              renderEach={(comp) => <div className="wrapper">{comp}</div>}
+            />
+          </SitecoreContext>
+        );
+
+        expect(renderedComponent.find('.wrapper').length).to.equal(1);
+      });
+
+      it('should render components based on the render function', () => {
+        const component: any = dataSet.data.sitecore.route;
+        const phKey = 'main';
+
+        const renderedComponent = mount(
+          <SitecoreContext componentFactory={componentFactory}>
+            <Placeholder
+              name={phKey}
+              rendering={component}
+              render={(comp) => <div className="wrapper">{comp}</div>}
+            />
+          </SitecoreContext>
+        );
+
+        expect(renderedComponent.find('.wrapper').length).to.equal(1);
+      });
+
+      it('when null passed to render function', () => {
+        it('should render empty placeholder', () => {
+          const component: any = dataSet.data.sitecore.route;
+          const phKey = 'main';
+
+          const renderedComponent = mount(
+            <SitecoreContext componentFactory={componentFactory}>
+              <Placeholder
+                name={phKey}
+                rendering={component}
+                render={() => null}
+              />
+            </SitecoreContext>
+          );
+
+          const placeholder = renderedComponent.find(Placeholder)
+          expect(placeholder.length).to.equal(1);
+          expect(placeholder.children()).to.be.empty;
+        });
+      })
+
+      it('should render output based on the renderEmpty function in case of no renderings', () => {
+        let component: any = dataSet.data.sitecore.route;
+        const renderings = component.placeholders.main.filter(({ componentName }: any) => !componentName);
+        const myComponent = {
+          ...component,
+          placeholders: {
+            ...component.placeholders,
+            main: [...renderings],
+          },
+        };
+
+        const phKey = 'main';
+
+        const renderedComponent = mount(
+          <SitecoreContext componentFactory={componentFactory}>
+            <Placeholder
+              name={phKey}
+              rendering={myComponent}
+              renderEmpty={(comp) => <div className="wrapper">{comp}</div>}
+            />
+          </SitecoreContext>
+        );
+
+        expect(renderedComponent.find('.wrapper').length).to.equal(1);
+        expect(renderedComponent.find('.download-callout-mock').length).to.equal(0);
+        expect(renderedComponent.find('.home-mock').length).to.equal(0);
+        expect(renderedComponent.find('.jumbotron-mock').length).to.equal(0);
+      });
+
       it('should pass properties to nested components', () => {
         const component = dataSet.data.sitecore.route as any;
         const phKey = 'main';