Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Quick fix for einstein data #1028

Merged
merged 5 commits into from
Mar 3, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
"packages/*"
],
"version": "2.7.0-alpha.1",
"version": "2.7.0-alpha.2",
"publish": {
"allowBranch": [
"master"
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pwa-kit",
"version": "2.7.0-alpha.1",
"version": "2.7.0-alpha.2",
"engines": {
"node": "^14.0.0 || ^16.0.0",
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/commerce-sdk-react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## v2.7.0-alpha.1 (Mar 02, 2023)
## v2.7.0-alpha.2 (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)
Expand Down
4 changes: 2 additions & 2 deletions packages/commerce-sdk-react/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/commerce-sdk-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "commerce-sdk-react-preview",
"version": "2.7.0-alpha.1",
"version": "2.7.0-alpha.2",
"description": "A library that provides react hooks for fetching data from Commerce Cloud",
"author": "[email protected]",
"license": "See license in LICENSE",
Expand Down Expand Up @@ -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.1",
"internal-lib-build": "^2.7.0-alpha.2",
"jsonwebtoken": "^8.5.1",
"nock": "^13.2.9",
"react": "^17.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/internal-lib-build/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/internal-lib-build/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "internal-lib-build",
"version": "2.7.0-alpha.1",
"version": "2.7.0-alpha.2",
"engines": {
"node": "^14.0.0 || ^16.0.0",
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/pwa-kit-create-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/pwa-kit-create-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pwa-kit-create-app",
"version": "2.7.0-alpha.1",
"version": "2.7.0-alpha.2",
"description": "Salesforce's project generator tool",
"author": "[email protected]",
"license": "See license in LICENSE",
Expand Down Expand Up @@ -39,7 +39,7 @@
"tar": "^6.1.11"
},
"devDependencies": {
"internal-lib-build": "^2.7.0-alpha.1",
"internal-lib-build": "^2.7.0-alpha.2",
"verdaccio": "^5.9.0"
}
}
2 changes: 1 addition & 1 deletion packages/pwa-kit-dev/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## v2.7.0-alpha.1 (Mar 02, 2023)
## v2.7.0-alpha.2 (Mar 02, 2023)
- Add explicit `ws` dependency [#865](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/865)

## v2.6.0 (Jan 25, 2023)
Expand Down
4 changes: 2 additions & 2 deletions packages/pwa-kit-dev/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/pwa-kit-dev/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pwa-kit-dev",
"version": "2.7.0-alpha.1",
"version": "2.7.0-alpha.2",
"description": "Build tools for pwa-kit",
"repository": {
"type": "git",
Expand Down Expand Up @@ -88,7 +88,7 @@
"minimatch": "3.0.5",
"open": "^8.4.0",
"prettier": "^2.8.3",
"pwa-kit-runtime": "^2.7.0-alpha.1",
"pwa-kit-runtime": "^2.7.0-alpha.2",
"react-refresh": "^0.13.0",
"replace-in-file": "^6.2.0",
"request": "^2.88.0",
Expand All @@ -109,7 +109,7 @@
},
"devDependencies": {
"@loadable/component": "^5.15.0",
"internal-lib-build": "^2.7.0-alpha.1",
"internal-lib-build": "^2.7.0-alpha.2",
"nock": "^13.1.1",
"superagent": "^6.1.0",
"supertest": "^4.0.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/pwa-kit-react-sdk/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## v2.7.0-alpha.1 (Mar 02, 2023)
## v2.7.0-alpha.2 (Mar 02, 2023)
## v2.6.0 (Jan 25, 2023)

## v2.5.0 (Jan 05, 2023)
Expand Down
4 changes: 2 additions & 2 deletions packages/pwa-kit-react-sdk/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/pwa-kit-react-sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pwa-kit-react-sdk",
"version": "2.7.0-alpha.1",
"version": "2.7.0-alpha.2",
"description": "A library that supports the isomorphic React rendering pipeline for Commerce Cloud Managed Runtime apps",
"engines": {
"node": "^14.0.0 || ^16.0.0",
Expand Down Expand Up @@ -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.1",
"pwa-kit-runtime": "^2.7.0-alpha.2",
"react-ssr-prepass": "^1.5.0",
"react-uid": "^2.2.0",
"serialize-javascript": "^6.0.0",
Expand All @@ -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.1",
"internal-lib-build": "^2.7.0-alpha.2",
"node-html-parser": "^3.3.4",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/pwa-kit-runtime/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## v2.7.0-alpha.1 (Mar 02, 2023)
## v2.7.0-alpha.2 (Mar 02, 2023)
- Support Node 16 [#965](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/965)

## v2.6.0 (Jan 25, 2023)
Expand Down
6 changes: 3 additions & 3 deletions packages/pwa-kit-runtime/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/pwa-kit-runtime/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pwa-kit-runtime",
"version": "2.7.0-alpha.1",
"version": "2.7.0-alpha.2",
"description": "The PWAKit Runtime",
"repository": {
"type": "git",
Expand Down Expand Up @@ -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.1",
"internal-lib-build": "^2.7.0-alpha.2",
"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.1"
"pwa-kit-dev": "^2.7.0-alpha.2"
},
"peerDependenciesMeta": {
"pwa-kit-dev": {
Expand Down
4 changes: 2 additions & 2 deletions packages/template-express-minimal/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/template-express-minimal/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "template-express-minimal",
"version": "2.7.0-alpha.1",
"version": "2.7.0-alpha.2",
"license": "See license in LICENSE",
"private": true,
"devDependencies": {
"pwa-kit-dev": "^2.7.0-alpha.1",
"pwa-kit-runtime": "^2.7.0-alpha.1",
"pwa-kit-dev": "^2.7.0-alpha.2",
"pwa-kit-runtime": "^2.7.0-alpha.2",
"supertest": "^4.0.2"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## v2.7.0-alpha.1 (Mar 02, 2023)
## v2.7.0-alpha.2 (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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,11 @@ class EinsteinAPI {
}
} else if (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you leave a TODO for refactoring the function? For the future, like when we move out this file out of the commerce-api folder.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll make note of it in either a new ticket of the tick for that einstein work (save time having all this rebuild again)

product.productType &&
(product.productType.master || product.productType.variant || product.productType.set)
(product.productType.master ||
product.productType.variant ||
product.productType.set ||
product.productType.bundle ||
product.productType.variationGroup)
) {
// handle variants & sets for PLP / viewCategory & viewSearch
// Assumes product is a ProductSearchHit from SCAPI Shopper-Search:
Expand Down
4 changes: 2 additions & 2 deletions packages/template-retail-react-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/template-retail-react-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "retail-react-app",
"version": "2.7.0-alpha.1",
"version": "2.7.0-alpha.2",
"license": "See license in LICENSE",
"private": true,
"engines": {
Expand Down Expand Up @@ -41,9 +41,9 @@
"nanoid": "^3.1.31",
"njwt": "^1.2.0",
"prop-types": "^15.6.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",
"pwa-kit-dev": "^2.7.0-alpha.2",
"pwa-kit-react-sdk": "^2.7.0-alpha.2",
"pwa-kit-runtime": "^2.7.0-alpha.2",
"query-string": "^7.0.1",
"raf": "^3.4.0",
"randomstring": "^1.2.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/template-typescript-minimal/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/template-typescript-minimal/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "typescript-minimal",
"version": "2.7.0-alpha.1",
"version": "2.7.0-alpha.2",
"engines": {
"node": "^14.0.0 || ^16.0.0",
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0"
Expand All @@ -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.1",
"pwa-kit-react-sdk": "^2.7.0-alpha.1",
"pwa-kit-runtime": "^2.7.0-alpha.1",
"pwa-kit-dev": "^2.7.0-alpha.2",
"pwa-kit-react-sdk": "^2.7.0-alpha.2",
"pwa-kit-runtime": "^2.7.0-alpha.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-helmet": "^6.1.0",
Expand Down
Loading