Release 2.7: fix order of hooks (#1027)

* Return early only after all of the hooks are called * Bumper version --------- Co-authored-by: Ben Chypak <[email protected]>
SalesforceCommerceCloud · Mar 2, 2023 · 168bb12 · 168bb12
1 parent 6ffeed3
commit 168bb12
Show file tree

Hide file tree

Showing 29 changed files with 64 additions and 63 deletions.
diff --git a/lerna.json b/lerna.json
@@ -3,7 +3,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "2.7.0-alpha.0",
+  "version": "2.7.0-alpha.1",
   "publish": {
     "allowBranch": [
       "master"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pwa-kit",
-  "version": "2.7.0-alpha.0",
+  "version": "2.7.0-alpha.1",
   "engines": {
     "node": "^14.0.0 || ^16.0.0",
     "npm": "^6.14.4 || ^7.0.0 || ^8.0.0"

diff --git a/packages/commerce-sdk-react/CHANGELOG.md b/packages/commerce-sdk-react/CHANGELOG.md
@@ -1,4 +1,4 @@
-## v2.7.0-alpha.0 (Mar 02, 2023)
+## v2.7.0-alpha.1 (Mar 02, 2023)
 - Add Page/Region/Component components for shopper experience/page designer page rendering [#963](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/963)
 - Namespace `Auth` storage keys with site identifier to allow multi-site support [#911](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/911)
 - Add Shopper Experience `usePage` and `usePages` hooks[#958](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/958)

diff --git a/packages/commerce-sdk-react/package-lock.json b/packages/commerce-sdk-react/package-lock.json
diff --git a/packages/commerce-sdk-react/package.json b/packages/commerce-sdk-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "commerce-sdk-react-preview",
-  "version": "2.7.0-alpha.0",
+  "version": "2.7.0-alpha.1",
   "description": "A library that provides react hooks for fetching data from Commerce Cloud",
   "author": "[email protected]",
   "license": "See license in LICENSE",
@@ -60,7 +60,7 @@
     "@types/react-dom": "^17.0.2",
     "@types/react-helmet": "^6.1.6",
     "cross-env": "^5.2.0",
-    "internal-lib-build": "^2.7.0-alpha.0",
+    "internal-lib-build": "^2.7.0-alpha.1",
     "jsonwebtoken": "^8.5.1",
     "nock": "^13.2.9",
     "react": "^17.0.2",

diff --git a/packages/internal-lib-build/package-lock.json b/packages/internal-lib-build/package-lock.json
diff --git a/packages/internal-lib-build/package.json b/packages/internal-lib-build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "internal-lib-build",
-  "version": "2.7.0-alpha.0",
+  "version": "2.7.0-alpha.1",
   "engines": {
     "node": "^14.0.0 || ^16.0.0",
     "npm": "^6.14.4 || ^7.0.0 || ^8.0.0"

diff --git a/packages/pwa-kit-create-app/package-lock.json b/packages/pwa-kit-create-app/package-lock.json
diff --git a/packages/pwa-kit-create-app/package.json b/packages/pwa-kit-create-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pwa-kit-create-app",
-  "version": "2.7.0-alpha.0",
+  "version": "2.7.0-alpha.1",
   "description": "Salesforce's project generator tool",
   "author": "[email protected]",
   "license": "See license in LICENSE",
@@ -39,7 +39,7 @@
     "tar": "^6.1.11"
   },
   "devDependencies": {
-    "internal-lib-build": "^2.7.0-alpha.0",
+    "internal-lib-build": "^2.7.0-alpha.1",
     "verdaccio": "^5.9.0"
   }
 }
diff --git a/packages/pwa-kit-dev/CHANGELOG.md b/packages/pwa-kit-dev/CHANGELOG.md
@@ -1,4 +1,4 @@
-## v2.7.0-alpha.0 (Mar 02, 2023)
+## v2.7.0-alpha.1 (Mar 02, 2023)
 - Add explicit `ws` dependency [#865](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/865)
 
 ## v2.6.0 (Jan 25, 2023)

diff --git a/packages/pwa-kit-dev/package-lock.json b/packages/pwa-kit-dev/package-lock.json
diff --git a/packages/pwa-kit-dev/package.json b/packages/pwa-kit-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pwa-kit-dev",
-  "version": "2.7.0-alpha.0",
+  "version": "2.7.0-alpha.1",
   "description": "Build tools for pwa-kit",
   "repository": {
     "type": "git",
@@ -88,7 +88,7 @@
     "minimatch": "3.0.5",
     "open": "^8.4.0",
     "prettier": "^2.8.3",
-    "pwa-kit-runtime": "^2.7.0-alpha.0",
+    "pwa-kit-runtime": "^2.7.0-alpha.1",
     "react-refresh": "^0.13.0",
     "replace-in-file": "^6.2.0",
     "request": "^2.88.0",
@@ -109,7 +109,7 @@
   },
   "devDependencies": {
     "@loadable/component": "^5.15.0",
-    "internal-lib-build": "^2.7.0-alpha.0",
+    "internal-lib-build": "^2.7.0-alpha.1",
     "nock": "^13.1.1",
     "superagent": "^6.1.0",
     "supertest": "^4.0.2"

diff --git a/packages/pwa-kit-react-sdk/CHANGELOG.md b/packages/pwa-kit-react-sdk/CHANGELOG.md
@@ -1,4 +1,4 @@
-## v2.7.0-alpha.0 (Mar 02, 2023)
+## v2.7.0-alpha.1 (Mar 02, 2023)
 ## v2.6.0 (Jan 25, 2023)
 
 ## v2.5.0 (Jan 05, 2023)

diff --git a/packages/pwa-kit-react-sdk/package-lock.json b/packages/pwa-kit-react-sdk/package-lock.json
diff --git a/packages/pwa-kit-react-sdk/package.json b/packages/pwa-kit-react-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pwa-kit-react-sdk",
-  "version": "2.7.0-alpha.0",
+  "version": "2.7.0-alpha.1",
   "description": "A library that supports the isomorphic React rendering pipeline for Commerce Cloud Managed Runtime apps",
   "engines": {
     "node": "^14.0.0 || ^16.0.0",
@@ -48,7 +48,7 @@
     "event-emitter": "^0.3.5",
     "hoist-non-react-statics": "^3.3.1",
     "prop-types": "^15.6.0",
-    "pwa-kit-runtime": "^2.7.0-alpha.0",
+    "pwa-kit-runtime": "^2.7.0-alpha.1",
     "react-ssr-prepass": "^1.5.0",
     "react-uid": "^2.2.0",
     "serialize-javascript": "^6.0.0",
@@ -59,7 +59,7 @@
     "@loadable/component": "^5.15.0",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.6.6",
     "enzyme": "^3.8.0",
-    "internal-lib-build": "^2.7.0-alpha.0",
+    "internal-lib-build": "^2.7.0-alpha.1",
     "node-html-parser": "^3.3.4",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

diff --git a/packages/pwa-kit-runtime/CHANGELOG.md b/packages/pwa-kit-runtime/CHANGELOG.md
@@ -1,4 +1,4 @@
-## v2.7.0-alpha.0 (Mar 02, 2023)
+## v2.7.0-alpha.1 (Mar 02, 2023)
 - Support Node 16 [#965](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/965)
 
 ## v2.6.0 (Jan 25, 2023)

diff --git a/packages/pwa-kit-runtime/package-lock.json b/packages/pwa-kit-runtime/package-lock.json
diff --git a/packages/pwa-kit-runtime/package.json b/packages/pwa-kit-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pwa-kit-runtime",
-  "version": "2.7.0-alpha.0",
+  "version": "2.7.0-alpha.1",
   "description": "The PWAKit Runtime",
   "repository": {
     "type": "git",
@@ -50,15 +50,15 @@
     "@serverless/event-mocks": "^1.1.1",
     "aws-lambda-mock-context": "^3.2.1",
     "fs-extra": "^10.1.0",
-    "internal-lib-build": "^2.7.0-alpha.0",
+    "internal-lib-build": "^2.7.0-alpha.1",
     "nock": "^13.1.1",
     "sinon": "^13.0.1",
     "superagent": "^6.1.0",
     "supertest": "^4.0.2",
     "watch": "1.0.1"
   },
   "peerDependencies": {
-    "pwa-kit-dev": "^2.7.0-alpha.0"
+    "pwa-kit-dev": "^2.7.0-alpha.1"
   },
   "peerDependenciesMeta": {
     "pwa-kit-dev": {

diff --git a/packages/template-express-minimal/package-lock.json b/packages/template-express-minimal/package-lock.json
diff --git a/packages/template-express-minimal/package.json b/packages/template-express-minimal/package.json
@@ -1,11 +1,11 @@
 {
     "name": "template-express-minimal",
-    "version": "2.7.0-alpha.0",
+    "version": "2.7.0-alpha.1",
     "license": "See license in LICENSE",
     "private": true,
     "devDependencies": {
-        "pwa-kit-dev": "^2.7.0-alpha.0",
-        "pwa-kit-runtime": "^2.7.0-alpha.0",
+        "pwa-kit-dev": "^2.7.0-alpha.1",
+        "pwa-kit-runtime": "^2.7.0-alpha.1",
         "supertest": "^4.0.2"
     },
     "scripts": {

diff --git a/packages/template-retail-react-app/CHANGELOG.md b/packages/template-retail-react-app/CHANGELOG.md
@@ -1,4 +1,4 @@
-## v2.7.0-alpha.0 (Mar 02, 2023)
+## v2.7.0-alpha.1 (Mar 02, 2023)
 - Add Page Designer ImageTile component [#967](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/967)
 - Add Page Designer ImageWithText component [#991](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/991)
 - Add Page Designer carousel component [#977](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/977)

diff --git a/packages/template-retail-react-app/app/hooks/use-add-to-cart-modal.js b/packages/template-retail-react-app/app/hooks/use-add-to-cart-modal.js
@@ -55,16 +55,17 @@ AddToCartModalProvider.propTypes = {
  */
 export const AddToCartModal = () => {
     const {isOpen, onClose, data} = useAddToCartModalContext()
-    if (!isOpen) {
-        return null
-    }
     const {product, itemsAdded = []} = data || {}
     const intl = useIntl()
     const basket = useBasket()
     const size = useBreakpointValue({base: 'full', lg: '2xl', xl: '4xl'})
     const {currency, productItems, productSubTotal} = basket
     const totalQuantity = itemsAdded.reduce((acc, {quantity}) => acc + quantity, 0)
 
+    if (!isOpen) {
+        return null
+    }
+
     return (
         <Modal size={size} isOpen={isOpen} onClose={onClose} scrollBehavior="inside" isCentered>
             <ModalOverlay />

diff --git a/packages/template-retail-react-app/package-lock.json b/packages/template-retail-react-app/package-lock.json
diff --git a/packages/template-retail-react-app/package.json b/packages/template-retail-react-app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "retail-react-app",
-    "version": "2.7.0-alpha.0",
+    "version": "2.7.0-alpha.1",
     "license": "See license in LICENSE",
     "private": true,
     "engines": {
@@ -41,9 +41,9 @@
         "nanoid": "^3.1.31",
         "njwt": "^1.2.0",
         "prop-types": "^15.6.0",
-        "pwa-kit-dev": "^2.7.0-alpha.0",
-        "pwa-kit-react-sdk": "^2.7.0-alpha.0",
-        "pwa-kit-runtime": "^2.7.0-alpha.0",
+        "pwa-kit-dev": "^2.7.0-alpha.1",
+        "pwa-kit-react-sdk": "^2.7.0-alpha.1",
+        "pwa-kit-runtime": "^2.7.0-alpha.1",
         "query-string": "^7.0.1",
         "raf": "^3.4.0",
         "randomstring": "^1.2.1",

diff --git a/packages/template-typescript-minimal/package-lock.json b/packages/template-typescript-minimal/package-lock.json
diff --git a/packages/template-typescript-minimal/package.json b/packages/template-typescript-minimal/package.json
@@ -1,6 +1,6 @@
 {
     "name": "typescript-minimal",
-    "version": "2.7.0-alpha.0",
+    "version": "2.7.0-alpha.1",
     "engines": {
         "node": "^14.0.0 || ^16.0.0",
         "npm": "^6.14.4 || ^7.0.0 || ^8.0.0"
@@ -11,9 +11,9 @@
         "@tanstack/react-query": "^4.0.10",
         "@types/react": "^17.0.2",
         "@types/react-dom": "^17.0.2",
-        "pwa-kit-dev": "^2.7.0-alpha.0",
-        "pwa-kit-react-sdk": "^2.7.0-alpha.0",
-        "pwa-kit-runtime": "^2.7.0-alpha.0",
+        "pwa-kit-dev": "^2.7.0-alpha.1",
+        "pwa-kit-react-sdk": "^2.7.0-alpha.1",
+        "pwa-kit-runtime": "^2.7.0-alpha.1",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
         "react-helmet": "^6.1.0",