From 20e238a5e6428fc189238958de21a3cb1332663b Mon Sep 17 00:00:00 2001 From: devops-pwa-codebuild Date: Mon, 10 Oct 2022 17:12:38 +0000 Subject: [PATCH 01/17] v12.7.0-alpha.1 --- package.json | 2 +- packages/create-pwa/package.json | 4 ++-- .../experience-platform-connector/package.json | 4 ++-- .../extensions/upward-security-headers/package.json | 4 ++-- .../extensions/venia-sample-eventing/package.json | 4 ++-- .../venia-sample-language-packs/package.json | 4 ++-- .../venia-sample-payments-checkmo/package.json | 6 +++--- packages/pagebuilder/package.json | 10 +++++----- packages/peregrine/package.json | 2 +- packages/pwa-theme-venia/package.json | 2 +- packages/venia-concept/package.json | 12 ++++++------ packages/venia-ui/package.json | 4 ++-- pwa-devdocs/package.json | 2 +- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index 98f466aace..8cc3d11712 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pwa-studio", - "version": "12.6.0", + "version": "12.7.0-alpha.1", "private": true, "workspaces": [ "packages/babel-preset-peregrine", diff --git a/packages/create-pwa/package.json b/packages/create-pwa/package.json index 8834bec0f8..9bfa032ad3 100644 --- a/packages/create-pwa/package.json +++ b/packages/create-pwa/package.json @@ -1,6 +1,6 @@ { "name": "@magento/create-pwa", - "version": "2.3.2", + "version": "2.3.3-alpha.1", "publishConfig": { "access": "public" }, @@ -30,7 +30,7 @@ "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/create-pwa#readme", "dependencies": { "@magento/pwa-buildpack": "~11.4.0", - "@magento/venia-concept": "~12.6.0", + "@magento/venia-concept": "12.7.0-alpha.1", "chalk": "^2.4.2", "change-case": "^3.1.0", "compression": "~1.7.4", diff --git a/packages/extensions/experience-platform-connector/package.json b/packages/extensions/experience-platform-connector/package.json index 459c7df789..229ed8a218 100644 --- a/packages/extensions/experience-platform-connector/package.json +++ b/packages/extensions/experience-platform-connector/package.json @@ -1,6 +1,6 @@ { "name": "@magento/experience-platform-connector", - "version": "1.0.1", + "version": "1.0.2-alpha.1", "publishConfig": { "access": "public" }, @@ -18,7 +18,7 @@ "devDependencies": {}, "peerDependencies": { "@apollo/client": "~3.5.0", - "@magento/peregrine": "~12.5.1", + "@magento/peregrine": "12.6.0-alpha.1", "@magento/pwa-buildpack": "~11.4.0", "react": "~17.0.1" }, diff --git a/packages/extensions/upward-security-headers/package.json b/packages/extensions/upward-security-headers/package.json index 0f8a968366..d0da4f9d91 100644 --- a/packages/extensions/upward-security-headers/package.json +++ b/packages/extensions/upward-security-headers/package.json @@ -1,6 +1,6 @@ { "name": "@magento/upward-security-headers", - "version": "1.0.10", + "version": "1.0.11-alpha.1", "publishConfig": { "access": "public" }, @@ -14,7 +14,7 @@ "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { "@magento/pwa-buildpack": "~11.4.0", - "@magento/venia-ui": "~9.6.0", + "@magento/venia-ui": "9.7.0-alpha.1", "webpack": "~4.46.0" }, "pwa-studio": { diff --git a/packages/extensions/venia-sample-eventing/package.json b/packages/extensions/venia-sample-eventing/package.json index b69e155e45..105987179c 100644 --- a/packages/extensions/venia-sample-eventing/package.json +++ b/packages/extensions/venia-sample-eventing/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-eventing", - "version": "0.0.2", + "version": "0.0.3-alpha.1", "publishConfig": { "access": "public" }, @@ -12,7 +12,7 @@ "repository": "github:magento/pwa-studio", "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { - "@magento/peregrine": "~12.5.1", + "@magento/peregrine": "12.6.0-alpha.1", "@magento/pwa-buildpack": "~11.4.0", "react": "~17.0.1" }, diff --git a/packages/extensions/venia-sample-language-packs/package.json b/packages/extensions/venia-sample-language-packs/package.json index 1471f18c74..4368afbfaf 100644 --- a/packages/extensions/venia-sample-language-packs/package.json +++ b/packages/extensions/venia-sample-language-packs/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-language-packs", - "version": "0.0.10", + "version": "0.0.11-alpha.1", "publishConfig": { "access": "public" }, @@ -13,7 +13,7 @@ "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { "@magento/pwa-buildpack": "~11.4.0", - "@magento/venia-ui": "~9.6.0" + "@magento/venia-ui": "9.7.0-alpha.1" }, "pwa-studio": { "targets": { diff --git a/packages/extensions/venia-sample-payments-checkmo/package.json b/packages/extensions/venia-sample-payments-checkmo/package.json index bd17db0f75..317bd2ac8d 100644 --- a/packages/extensions/venia-sample-payments-checkmo/package.json +++ b/packages/extensions/venia-sample-payments-checkmo/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-payments-checkmo", - "version": "0.0.8", + "version": "0.0.9-alpha.1", "publishConfig": { "access": "public" }, @@ -12,9 +12,9 @@ "repository": "github:magento/pwa-studio", "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { - "@magento/peregrine": "~12.5.1", + "@magento/peregrine": "12.6.0-alpha.1", "@magento/pwa-buildpack": "~11.4.0", - "@magento/venia-ui": "~9.6.0", + "@magento/venia-ui": "9.7.0-alpha.1", "react": "~17.0.1", "react-intl": "~5.20.0", "react-router-dom": "~5.2.0" diff --git a/packages/pagebuilder/package.json b/packages/pagebuilder/package.json index b1c31f4845..07fbb3bb79 100644 --- a/packages/pagebuilder/package.json +++ b/packages/pagebuilder/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pagebuilder", - "version": "7.4.1", + "version": "7.4.2-alpha.1", "publishConfig": { "access": "public" }, @@ -34,9 +34,9 @@ "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/pagebuilder#readme", "dependencies": {}, "devDependencies": { - "@magento/peregrine": "~12.5.1", + "@magento/peregrine": "12.6.0-alpha.1", "@magento/pwa-buildpack": "~11.4.0", - "@magento/venia-ui": "~9.6.0", + "@magento/venia-ui": "9.7.0-alpha.1", "@storybook/react": "~6.3.7", "jarallax": "~1.11.1", "load-google-maps-api": "~2.0.1", @@ -50,9 +50,9 @@ "peerDependencies": { "@apollo/client": "~3.5.0", "@magento/babel-preset-peregrine": "~1.2.1", - "@magento/peregrine": "~12.5.1", + "@magento/peregrine": "12.6.0-alpha.1", "@magento/pwa-buildpack": "~11.4.0", - "@magento/venia-ui": "~9.6.0", + "@magento/venia-ui": "9.7.0-alpha.1", "jarallax": "~1.11.1", "load-google-maps-api": "~2.0.1", "lodash.escape": "~4.0.1", diff --git a/packages/peregrine/package.json b/packages/peregrine/package.json index 7d0a854dc6..77132dac8e 100644 --- a/packages/peregrine/package.json +++ b/packages/peregrine/package.json @@ -1,6 +1,6 @@ { "name": "@magento/peregrine", - "version": "12.5.1", + "version": "12.6.0-alpha.1", "publishConfig": { "access": "public" }, diff --git a/packages/pwa-theme-venia/package.json b/packages/pwa-theme-venia/package.json index 6a0c42d70b..0d37f42209 100644 --- a/packages/pwa-theme-venia/package.json +++ b/packages/pwa-theme-venia/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pwa-theme-venia", - "version": "1.3.0", + "version": "1.4.0-alpha.1", "publishConfig": { "access": "public" }, diff --git a/packages/venia-concept/package.json b/packages/venia-concept/package.json index a6878882b7..25b7f8d87c 100644 --- a/packages/venia-concept/package.json +++ b/packages/venia-concept/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-concept", - "version": "12.6.0", + "version": "12.7.0-alpha.1", "publishConfig": { "access": "public" }, @@ -52,11 +52,11 @@ "@babel/runtime": "~7.15.3", "@magento/babel-preset-peregrine": "~1.2.1", "@magento/eslint-config": "~1.5.0", - "@magento/pagebuilder": "~7.4.1", - "@magento/peregrine": "~12.5.1", - "@magento/pwa-theme-venia": "~1.3.0", - "@magento/upward-security-headers": "~1.0.10", - "@magento/venia-ui": "~9.6.0", + "@magento/pagebuilder": "7.4.2-alpha.1", + "@magento/peregrine": "12.6.0-alpha.1", + "@magento/pwa-theme-venia": "1.4.0-alpha.1", + "@magento/upward-security-headers": "1.0.11-alpha.1", + "@magento/venia-ui": "9.7.0-alpha.1", "@pmmmwh/react-refresh-webpack-plugin": "0.4.1", "@storybook/react": "~6.3.7", "@types/node": "16", diff --git a/packages/venia-ui/package.json b/packages/venia-ui/package.json index 191db0c738..dde74bac23 100644 --- a/packages/venia-ui/package.json +++ b/packages/venia-ui/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-ui", - "version": "9.6.0", + "version": "9.7.0-alpha.1", "publishConfig": { "access": "public" }, @@ -80,7 +80,7 @@ "peerDependencies": { "@apollo/client": "~3.5.0", "@magento/babel-preset-peregrine": "~1.2.1", - "@magento/peregrine": "~12.5.1", + "@magento/peregrine": "12.6.0-alpha.1", "@magento/pwa-buildpack": "~11.4.0", "apollo-cache-persist": "~0.1.1", "braintree-web-drop-in": "~1.33.3", diff --git a/pwa-devdocs/package.json b/pwa-devdocs/package.json index 327ebaf349..5673778fed 100644 --- a/pwa-devdocs/package.json +++ b/pwa-devdocs/package.json @@ -1,7 +1,7 @@ { "name": "pwa-devdocs", "private": true, - "version": "12.6.0", + "version": "12.7.0-alpha.1", "description": "A documentation site for Magento PWA", "main": "gulpfile.js", "dependencies": { From e85d2f7e620b0a9bf054d7f80e6eb44e985d250b Mon Sep 17 00:00:00 2001 From: Bruce Denham Date: Tue, 18 Oct 2022 19:56:14 -0500 Subject: [PATCH 02/17] chore: update for release 12.7 (#3985) --- magento-compatibility.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/magento-compatibility.js b/magento-compatibility.js index 99671b203b..c3501456a8 100644 --- a/magento-compatibility.js +++ b/magento-compatibility.js @@ -1,9 +1,10 @@ /** - * This file describes PWA Studio to Magento version compatabilities. + * This file describes PWA Studio to Magento version compatibilities. */ // PWA Studio version -> Magento version. module.exports = { + '12.7.0': '2.4.5', '12.6.0': '2.4.5', '12.5.0': '2.4.4', '12.4.0': '2.4.4', From 3d7e842ffab03403cdc836805605d925e8623ad5 Mon Sep 17 00:00:00 2001 From: Bruce Denham Date: Wed, 19 Oct 2022 08:56:54 -0500 Subject: [PATCH 03/17] Remove all pwastudio.io documentation links (#3984) * docs: correct peregrine reference to PWA docs * docs: replace all references to pwastudio.io * docs(link): update doc links to use correct anchors * fix(docs): added space to link to fix broken resolution Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> --- .github/SUPPORT.md | 8 ++++---- packages/babel-preset-peregrine/README.md | 2 +- .../lib/index.js | 2 +- packages/peregrine/README.md | 2 +- packages/peregrine/docs/RestApi.md | 4 ++-- packages/peregrine/docs/Router.md | 3 +-- .../peregrine/lib/targets/HookInterceptorSet.js | 2 +- .../peregrine/lib/targets/peregrine-declare.js | 2 +- packages/pwa-buildpack/README.md | 2 +- packages/pwa-buildpack/docs/MagentoResolver.md | 2 +- .../docs/MagentoRootComponentsPlugin.md | 2 +- packages/pwa-buildpack/docs/PWADevServer.md | 2 +- packages/pwa-buildpack/docs/ServiceWorkerPlugin.md | 2 +- .../pwa-buildpack/lib/BuildBus/TargetProvider.js | 4 ++-- .../pwa-buildpack/lib/BuildBus/declare-base.js | 14 +++++++------- .../lib/Utilities/getEnvVarDefinitions.js | 12 ++++++------ packages/venia-concept/README.md | 2 +- packages/venia-concept/upward.yml | 2 +- pwa-devdocs/README.md | 2 +- .../src/_includes/layout/header-scripts.html | 2 +- .../src/frequently-asked-questions/index.md | 2 -- pwa-devdocs/src/technologies/overview/index.md | 9 ++++----- pwa-devdocs/src/tutorials/cloud-deploy/index.md | 4 ++-- 23 files changed, 42 insertions(+), 46 deletions(-) diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md index e881f75920..9c4171075c 100644 --- a/.github/SUPPORT.md +++ b/.github/SUPPORT.md @@ -2,9 +2,9 @@ Need help with something? Please use the following resources to get the help you need: -- Documentation website - [PWA DevDocs] -- Chat with us on **Slack** - [#pwa channel] -- Send us an Email: pwa@magento.com +- Documentation website - [PWA DevDocs] +- Chat with us on **Slack** - [#pwa channel] +- Send us an Email: pwa@magento.com -[pwa devdocs]: https://pwastudio.io +[pwa devdocs]: https://developer.adobe.com/commerce/pwa-studio/ [#pwa channel]: https://magentocommeng.slack.com/messages/C71HNKYS2 diff --git a/packages/babel-preset-peregrine/README.md b/packages/babel-preset-peregrine/README.md index e41ea62e4d..7cec4a5872 100644 --- a/packages/babel-preset-peregrine/README.md +++ b/packages/babel-preset-peregrine/README.md @@ -1 +1 @@ -Documentation for Magento PWA Studio packages is located at [https://pwastudio.io](https://pwastudio.io). +Documentation for Magento PWA Studio packages is located at [https://developer.adobe.com/commerce/pwa-studio/](https://developer.adobe.com/commerce/pwa-studio/). diff --git a/packages/graphql-cli-validate-magento-pwa-queries/lib/index.js b/packages/graphql-cli-validate-magento-pwa-queries/lib/index.js index fe53eabd31..723cb4fe74 100644 --- a/packages/graphql-cli-validate-magento-pwa-queries/lib/index.js +++ b/packages/graphql-cli-validate-magento-pwa-queries/lib/index.js @@ -22,7 +22,7 @@ const exitCodes = { FAILURE: 1 }; const DOCS_COMPAT_TABLE_PATH = - 'https://pwastudio.io/technologies/magento-compatibility/'; + 'https://developer.adobe.com/commerce/pwa-studio/integrations/adobe-commerce/version-compatibility'; const plugin = { COMMAND: 'validate-magento-pwa-queries', DESCRIPTION: diff --git a/packages/peregrine/README.md b/packages/peregrine/README.md index e41ea62e4d..7cec4a5872 100644 --- a/packages/peregrine/README.md +++ b/packages/peregrine/README.md @@ -1 +1 @@ -Documentation for Magento PWA Studio packages is located at [https://pwastudio.io](https://pwastudio.io). +Documentation for Magento PWA Studio packages is located at [https://developer.adobe.com/commerce/pwa-studio/](https://developer.adobe.com/commerce/pwa-studio/). diff --git a/packages/peregrine/docs/RestApi.md b/packages/peregrine/docs/RestApi.md index 596ec507a0..4f72a3cf28 100644 --- a/packages/peregrine/docs/RestApi.md +++ b/packages/peregrine/docs/RestApi.md @@ -1,5 +1,5 @@ # REST API Clients -Documentation has been moved to the [REST API client][] topic in the PWA devdocs site. +Documentation has been moved to the [Commerce REST API][] site. -[REST API client]: https://pwastudio.io/peregrine/reference/rest-api-client/ +[Commerce REST API]: https://developer.adobe.com/commerce/webapi/rest/ diff --git a/packages/peregrine/docs/Router.md b/packages/peregrine/docs/Router.md index c4e880ed33..f1eff06b69 100644 --- a/packages/peregrine/docs/Router.md +++ b/packages/peregrine/docs/Router.md @@ -2,5 +2,4 @@ Documentation content has been moved to the [Router][] topic in the PWA devdocs site. -[Router]: https://pwastudio.io/peregrine/reference/router/ - +[Router]: https://developer.adobe.com/commerce/pwa-studio/api/peregrine/components-and-utilities/Router/ diff --git a/packages/peregrine/lib/targets/HookInterceptorSet.js b/packages/peregrine/lib/targets/HookInterceptorSet.js index 776626bfca..e7b36c7ffc 100644 --- a/packages/peregrine/lib/targets/HookInterceptorSet.js +++ b/packages/peregrine/lib/targets/HookInterceptorSet.js @@ -14,7 +14,7 @@ class HookInterceptorSet extends Trackable { /** * Direct access to the array of all generated hooks. Used for retrieving all the transform requests. * @type {TransformRequest[]} - * @see [TransformRequest]{@link https://pwastudio.io/pwa-buildpack/reference/transform-requests/#addTransform} + * @see [TransformRequest]{@link https://developer.adobe.com/commerce/pwa-studio/api/buildpack/transform-requests/} */ get allModules() { return this._all; diff --git a/packages/peregrine/lib/targets/peregrine-declare.js b/packages/peregrine/lib/targets/peregrine-declare.js index b3bf2dd943..87a19795bd 100644 --- a/packages/peregrine/lib/targets/peregrine-declare.js +++ b/packages/peregrine/lib/targets/peregrine-declare.js @@ -70,7 +70,7 @@ module.exports = targets => { * * Interceptors of `hooks` should call `wrapWith` on the individual hooks in * the provided [`HookInterceptorSet` object]{@link - * http://pwastudio.io/peregrine/reference/targets/wrappable-talons}. + * https://developer.adobe.com/commerce/pwa-studio/tutorials/targets/modify-talon-results/}. * * @callback hookInterceptFunction * @param {HookInterceptorSet} hookInterceptors Registry of wrappable hook namespaces diff --git a/packages/pwa-buildpack/README.md b/packages/pwa-buildpack/README.md index e41ea62e4d..7cec4a5872 100644 --- a/packages/pwa-buildpack/README.md +++ b/packages/pwa-buildpack/README.md @@ -1 +1 @@ -Documentation for Magento PWA Studio packages is located at [https://pwastudio.io](https://pwastudio.io). +Documentation for Magento PWA Studio packages is located at [https://developer.adobe.com/commerce/pwa-studio/](https://developer.adobe.com/commerce/pwa-studio/). diff --git a/packages/pwa-buildpack/docs/MagentoResolver.md b/packages/pwa-buildpack/docs/MagentoResolver.md index d227ef3e5b..5fbf071875 100644 --- a/packages/pwa-buildpack/docs/MagentoResolver.md +++ b/packages/pwa-buildpack/docs/MagentoResolver.md @@ -2,4 +2,4 @@ Documentation content has been moved to the [MagentoResolver][] page on the PWA devdocs site. -[MagentoResolver]: https://pwastudio.io/pwa-buildpack/reference/magento-resolver/ +[MagentoResolver]: https://developer.adobe.com/commerce/pwa-studio/api/buildpack/webpack/magento-resolver/ diff --git a/packages/pwa-buildpack/docs/MagentoRootComponentsPlugin.md b/packages/pwa-buildpack/docs/MagentoRootComponentsPlugin.md index 795fc80eb8..3221f44875 100644 --- a/packages/pwa-buildpack/docs/MagentoRootComponentsPlugin.md +++ b/packages/pwa-buildpack/docs/MagentoRootComponentsPlugin.md @@ -2,4 +2,4 @@ Documentation content has been moved to the [MagentoRootComponentsPlugin] page in the PWA devdocs site. -[MagentoRootComponentsPlugin]: https://pwastudio.io/pwa-buildpack/reference/root-components-plugin/ +[MagentoRootComponentsPlugin]: https://developer.adobe.com/commerce/pwa-studio/api/buildpack/webpack/magento-root-components-plugin/ diff --git a/packages/pwa-buildpack/docs/PWADevServer.md b/packages/pwa-buildpack/docs/PWADevServer.md index 4eb680fc03..1dcc66c7af 100644 --- a/packages/pwa-buildpack/docs/PWADevServer.md +++ b/packages/pwa-buildpack/docs/PWADevServer.md @@ -2,4 +2,4 @@ Documentation content has been moved to the [PWADevServer][] page in the PWA devdocs site. -[PWADevServer]: https://pwastudio.io/pwa-buildpack/reference/pwa-dev-server/ +[PWADevServer]: https://developer.adobe.com/commerce/pwa-studio/api/buildpack/webpack/dev-server/ diff --git a/packages/pwa-buildpack/docs/ServiceWorkerPlugin.md b/packages/pwa-buildpack/docs/ServiceWorkerPlugin.md index 1d31200194..0c9d58c04f 100644 --- a/packages/pwa-buildpack/docs/ServiceWorkerPlugin.md +++ b/packages/pwa-buildpack/docs/ServiceWorkerPlugin.md @@ -2,4 +2,4 @@ Documentation content has been moved to the [ServiceWorkerPlugin][] page in the PWA devdocs site. -[ServiceWorkerPlugin]: https://pwastudio.io/pwa-buildpack/reference/serviceworker-plugin/ +[ServiceWorkerPlugin]: https://developer.adobe.com/commerce/pwa-studio/api/buildpack/webpack/service-worker/ diff --git a/packages/pwa-buildpack/lib/BuildBus/TargetProvider.js b/packages/pwa-buildpack/lib/BuildBus/TargetProvider.js index 52192a1988..b2ac87f40b 100644 --- a/packages/pwa-buildpack/lib/BuildBus/TargetProvider.js +++ b/packages/pwa-buildpack/lib/BuildBus/TargetProvider.js @@ -10,7 +10,7 @@ const { } = require('./mapHooksToTargets'); /** - * Respond to a request from a [TargetProvider]{@link https://pwastudio.io/pwa-buildpack/reference/buildbus/targetprovider/} + * Respond to a request from a [TargetProvider]{@link https://developer.adobe.com/commerce/pwa-studio/guides/general-concepts/extensibility/#targetproviders} * to retrieve a different(external) TargetProvider. * * This callback pattern helps to loosely couple TargetProviders so @@ -43,7 +43,7 @@ class TargetProvider extends Trackable { * @param {Object} dep - The package which owns this TargetProvider. * @param {string} dep.name - Name of the package which owns this. * @param {getExternalTargets} getExternalTargets - Function this TargetProvider will use to retrieve external packages when they are requested with `.of()`. - * Should usually be a delegate to BuildBus's [`getExternalTargets()`]{@link http://pwastudio.io/pwa-buildpack/reference/buildbus/targetprovider/#buildpackbuildbusgetexternaltargets--targetprovider} + * Should usually be a delegate to BuildBus's [`getExternalTargets()`]{@link https://developer.adobe.com/commerce/pwa-studio/guides/general-concepts/extensibility/#targetproviders} * * @memberof TargetProvider */ diff --git a/packages/pwa-buildpack/lib/BuildBus/declare-base.js b/packages/pwa-buildpack/lib/BuildBus/declare-base.js index 76a578e100..32efff8ebc 100644 --- a/packages/pwa-buildpack/lib/BuildBus/declare-base.js +++ b/packages/pwa-buildpack/lib/BuildBus/declare-base.js @@ -21,16 +21,16 @@ module.exports = targets => { /** * Called to collect the definitions and documentation for project-wide * configuration values. Core environment variables are defined in the - * [`envVarDefinitions.json` file]{@link http://pwastudio.io/pwa-buildpack/reference/environment-variables/core-definitions/}. + * [`envVarDefinitions.json` file]{@link https://github.com/magento/pwa-studio/blob/develop/packages/pwa-buildpack/envVarDefinitions.json}. * * Intercept this target in your project to add new environment * variables, typed and documented. This integrates your extension * configuration with the project-wide environment variable system. * - * @see [Variable definition schema]{@link http://pwastudio.io/pwa-buildpack/reference/environment-variables/definitions-api/} - * @see [Core variable definitions]{@link http://pwastudio.io/pwa-buildpack/reference/environment-variables/core-definitions/} + * @see [Variable definition schema]{@link https://developer.adobe.com/commerce/pwa-studio/api/buildpack/environment/definition-object/} + * @see [Core variable definitions]{@link https://developer.adobe.com/commerce/pwa-studio/api/buildpack/environment/variables/} * - * @param {object} envVarDefinitions The [variable definitions object]{@link http://pwastudio.io/pwa-buildpack/reference/environment-variables/definitions-api/}. + * @param {object} envVarDefinitions The [variable definitions object]{@link https://developer.adobe.com/commerce/pwa-studio/api/buildpack/environment/definition-object/}. * Modify in place. * @member {tapable.SyncHook} * @example Add config fields for your extension @@ -111,7 +111,7 @@ module.exports = targets => { * Use a [specialFeatures intercept function]{@link specialFeaturesIntercept} * to add special build features for the modules used in your project. * - * @see [Special flags in `configureWebpack()`]{@link http://pwastudio.io/pwa-buildpack/reference/configure-webpack/#special-flags} + * @see [Special flags in `configureWebpack()`]{@link https://developer.adobe.com/commerce/pwa-studio/api/buildpack/webpack/configure/#special-flags} * * @member {tapable.SyncHook} * @@ -250,11 +250,11 @@ module.exports = targets => { /** * Callback to add a transform. * - * @see [TransformRequest]{@link https://pwastudio.io/pwa-buildpack/reference/transform-requests/#addTransform} + * @see [TransformRequest]{@link https://developer.adobe.com/commerce/pwa-studio/api/buildpack/transform-requests/} * * @callback addTransform * @param {Buildpack/WebpackTools~TransformRequest} transformRequest - - * [Request]{@link https://pwastudio.io/pwa-buildpack/reference/transform-requests/#addTransform} + * [Request]{@link https://developer.adobe.com/commerce/pwa-studio/api/buildpack/transform-requests/} * to apply a transform to a file provided by this dependency. */ diff --git a/packages/pwa-buildpack/lib/Utilities/getEnvVarDefinitions.js b/packages/pwa-buildpack/lib/Utilities/getEnvVarDefinitions.js index 9b7d985185..2bc0fd7b62 100644 --- a/packages/pwa-buildpack/lib/Utilities/getEnvVarDefinitions.js +++ b/packages/pwa-buildpack/lib/Utilities/getEnvVarDefinitions.js @@ -5,8 +5,8 @@ const debug = require('debug')('pwa-buildpack:getEnvVarDefinitions'); /** * Get the list of environment definitions. - * Calling this function will invoke the [`envVarDefinitions`]{@link http://pwastudio.io/pwa-buildpack/reference/buildbus/targets/#module_BuiltinTargets.envVarDefinitions} - * target, passing the list of [built-in environment variables]{@link http://pwastudio.io/pwa-buildpack/reference/environment-variables/core-definitions/} + * Calling this function will invoke the [`envVarDefinitions`]{@link https://developer.adobe.com/commerce/pwa-studio/api/buildpack/environment/definition-object/} + * target, passing the list of [built-in environment variables]{@link https://developer.adobe.com/commerce/pwa-studio/api/buildpack/environment/variables/} * to all interceptors. * Any installed dependencies that intercept this target may add to or modify the list of environment variables. * @@ -50,10 +50,10 @@ module.exports = getEnvVarDefinitions; * Defines the global settings of the project as a list of typed environment variables. * Includes a set of changes made to the environment variables in recent versions, to aid with migration and upgrades. * - * `EnvVarDefinitions` are used by [`loadEnvironment()`]{@link http://pwastudio.io/pwa-buildpack/reference/buildpack-cli/load-env/#loadenvironmentdirorenv-logger} + * `EnvVarDefinitions` are used by [`loadEnvironment()`]{@link https://developer.adobe.com/commerce/pwa-studio/api/buildpack/cli/load-environment-file/} * to validate the currently defined values in the environment. * - * `EnvVarDefinitions` are also used by [`createDotEnvFile()`]{@link http://pwastudio.io/pwa-buildpack/reference/buildpack-cli/create-env-file/#createdotenvfiledirectory-options} + * `EnvVarDefinitions` are also used by [`createDotEnvFile()`]{@link https://developer.adobe.com/commerce/pwa-studio/api/buildpack/cli/create-environment-file/} * to generate an extensively commented `.env` file for a project. * * @typedef {Object} EnvVarDefinitions @@ -79,8 +79,8 @@ module.exports = getEnvVarDefinitions; * and/or an array of `choices` to limit the valid values. * * The recommended way to access the current environment values in build scripts and interceptors is through the - * [Configuration]{@link http://pwastudio.io/pwa-buildpack/reference/buildpack-cli/load-env/#configuration-object} - * object returned by [`loadEnvironment()`]{@link http://pwastudio.io/pwa-buildpack/reference/buildpack-cli/load-env/#loadenvironmentdirorenv-logger}. + * [Configuration object]{@link https://developer.adobe.com/commerce/pwa-studio/guides/general-concepts/configuration/#configuration-object} + * object returned by [`loadEnvironment()`]{@link https://developer.adobe.com/commerce/pwa-studio/api/buildpack/cli/load-environment-file/}. * * **Note:** Any build environment will have hundreds of environment variables _set_, most of which are unrelated to the build process. * Any environment variable during the build is accessible via `process.env` in NodeJS. diff --git a/packages/venia-concept/README.md b/packages/venia-concept/README.md index e41ea62e4d..7cec4a5872 100644 --- a/packages/venia-concept/README.md +++ b/packages/venia-concept/README.md @@ -1 +1 @@ -Documentation for Magento PWA Studio packages is located at [https://pwastudio.io](https://pwastudio.io). +Documentation for Magento PWA Studio packages is located at [https://developer.adobe.com/commerce/pwa-studio/](https://developer.adobe.com/commerce/pwa-studio/). diff --git a/packages/venia-concept/upward.yml b/packages/venia-concept/upward.yml index 27fdfb5b05..957f27746d 100644 --- a/packages/venia-concept/upward.yml +++ b/packages/venia-concept/upward.yml @@ -1,7 +1,7 @@ # This is the UPWARD specification file for the Venia storefront. # It is used by an UPWARD server implementation, such as upward-js and # upward-php, to describe how the server responds to requests. -# See: https://pwastudio.io/technologies/upward/ +# See: https://developer.adobe.com/commerce/pwa-studio/guides/packages/upward # The root properties of an UPWARD spec file are part of a global context # that includes request and environment data. diff --git a/pwa-devdocs/README.md b/pwa-devdocs/README.md index a99ba48639..e22d86b0e4 100644 --- a/pwa-devdocs/README.md +++ b/pwa-devdocs/README.md @@ -79,7 +79,7 @@ This project is licensed under OSL-3.0 - see the [LICENSE.txt] file for details. [contribution guidelines]: https://magento.github.io/pwa-studio/technologies/contribute/ [code of conduct]: https://github.com/magento/pwa-studio/blob/develop/.github/CODE_OF_CONDUCT.md [license.txt]: LICENSE.txt -[documentation site]: https://pwastudio.io +[documentation site]: https://developer.adobe.com/commerce/pwa-studio/ [node.js]: https://nodejs.org [ruby]: https://www.ruby-lang.org/ [bundler]: http://bundler.io/ diff --git a/pwa-devdocs/src/_includes/layout/header-scripts.html b/pwa-devdocs/src/_includes/layout/header-scripts.html index 582c1c639b..9b25ff90ec 100644 --- a/pwa-devdocs/src/_includes/layout/header-scripts.html +++ b/pwa-devdocs/src/_includes/layout/header-scripts.html @@ -10,7 +10,7 @@ { label: "PWA", name: "pwa-devdocs", - baseUrl: "https://pwastudio.io" + baseUrl: "https://developer.adobe.com/commerce/pwa-studio" }, { label: "DevDocs", diff --git a/pwa-devdocs/src/frequently-asked-questions/index.md b/pwa-devdocs/src/frequently-asked-questions/index.md index d39920044b..5c8a9b7903 100644 --- a/pwa-devdocs/src/frequently-asked-questions/index.md +++ b/pwa-devdocs/src/frequently-asked-questions/index.md @@ -108,8 +108,6 @@ _**Note:** For testing, resize the viewport manually instead of using the native [prerender.io]: https://prerender.io/ -[pwa studio stats]: https://pwastudio-stats.com/ - [magento 2 upward connector module]: https://github.com/magento/magento2-upward-connector [windows subsystem for linux]: https://docs.microsoft.com/en-us/windows/wsl/install-win10 diff --git a/pwa-devdocs/src/technologies/overview/index.md b/pwa-devdocs/src/technologies/overview/index.md index 2a4e539b0c..38e3f38885 100644 --- a/pwa-devdocs/src/technologies/overview/index.md +++ b/pwa-devdocs/src/technologies/overview/index.md @@ -69,9 +69,9 @@ This server also contains sample data for a fashion store to show the different Other notable packages in PWA Studio include: -- **[pwastudio.io][]** - Provides documentation to help guide developers towards creating a Magento PWA storefront -- **[UPWARD][]** - A proxy-server concept that describes a highly configurable server that sits between the PWA storefront and backend services, such as Magento -- **[PageBuilder][]** - PageBuilder extension for PWA Studio +- **[PWA Studio docs][]** - Provides documentation to help guide developers towards creating a Magento PWA storefront +- **[UPWARD][]** - A proxy-server concept that describes a highly configurable server that sits between the PWA storefront and backend services, such as Magento +- **[PageBuilder][]** - PageBuilder extension for PWA Studio [tools and libraries]: {% link technologies/tools-libraries/index.md %} [pwa-buildpack]: {% link pwa-buildpack/index.md %} @@ -83,9 +83,8 @@ Other notable packages in PWA Studio include: [set up a new storefront project]: <{%link tutorials/pwa-studio-fundamentals/project-setup/index.md %}> [pagebuilder]: <{%link pagebuilder/index.md %}> -[pwastudio.io]: https://pwastudio.io +[pwa studio docs]: https://developer.adobe.com/commerce/pwa-studio/ [web.dev]: https://web.dev/progressive-web-apps/ [developers.google.com]: https://developers.google.com/web/updates/2015/12/getting-started-pwa [developer.mozilla.org]: https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps [rail]: https://web.dev/rail/ - diff --git a/pwa-devdocs/src/tutorials/cloud-deploy/index.md b/pwa-devdocs/src/tutorials/cloud-deploy/index.md index cbd84a7b46..d2d308eb39 100644 --- a/pwa-devdocs/src/tutorials/cloud-deploy/index.md +++ b/pwa-devdocs/src/tutorials/cloud-deploy/index.md @@ -226,9 +226,9 @@ variables, such as `CONFIG__DEFAULT__WEB__UPWARD__PATH` and `MAGENTO_BACKEND_URL [environment variables]: <{%link pwa-buildpack/reference/environment-variables/core-definitions/index.md %}> [project setup]: <{%link tutorials/pwa-studio-fundamentals/project-setup/index.md %}> -[magento pwa studio]: http://pwastudio.io +[magento pwa studio]: https://developer.adobe.com/commerce/pwa-studio/ [`@magento/venia-concept`]: https://www.npmjs.com/package/@magento/venia-concept -[venia storefront]: https://pwastudio.io/venia-pwa-concept/ +[venia storefront]: https://developer.adobe.com/commerce/pwa-studio/guides/storefront-architecture/ [create a `package.json`]: https://docs.npmjs.com/cli/init [magento2-upward-connector]: https://github.com/magento/magento2-upward-connector From da54f7aca29c0f2287c80d516044c2d2f6e66f0e Mon Sep 17 00:00:00 2001 From: Bruce Denham Date: Thu, 20 Oct 2022 16:46:08 -0500 Subject: [PATCH 04/17] [Docs] Release notes for PWA Studio release 12.7 (#3987) * docs: release notes for pwa studio release 12.7 * docs: fixed feature wording and formatting * fix(docs): update venia-sample-backends package version * docs: add more info to the Highlights section. --- CHANGELOG.md | 122 ++++++++++++++++++++++++++++----------------------- 1 file changed, 68 insertions(+), 54 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5b0777b11..7eb6df82ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,28 +1,37 @@ -# PWA Studio Release 12.6.0 +# PWA Studio Release 12.7.0 **NOTE:** -_This changelog only contains release notes for PWA Studio and Venia 12.6.0_. +_This changelog only contains release notes for PWA Studio and Venia 12.7.0_. _For older release notes, see_ [PWA Studio releases][]. ## Highlights -The 12.6.0 release of PWA Studio focuses on accessibility improvements and bug fixes. - -- Accessibility Improvements: Added autocomplete attributes to checkout shipping and payment forms — [3785][] -- Accessibility Improvements:: Open panels now have keyboard focus. — [3805][] -- Accessibility Improvements:: Navigation buttons for carousels now meet contrast requirements. — [3787][] -- Controls now have a descriptive accessible name. Visible \[label] elements are correctly associated with their inputs using the "for" attribute. — [3786][] -- Removes duplicate logic from QuoteGraphQlPwa module — [29][] -- Bug Fix: Failing cypress tests fixed — [3911][] -- Bug Fix - Braintree payment form Customer Name field values now appear normal. — [3912][] -- Bug Fix: Braintree npm package braintree-web-drop-in updated to latest version to fix csp related console errors. — [3912][] -- Accessibility Improvements: Keyboard focus no longer lands on hidden elements in Kebab menu — [3800][] -- Fixed a bug in mobile view where the Edit and Remove options in the kebab menu for a cart item on the cart page is non functional. - [3925][] -- Fixed a console error when accessing different filters. - [30][] +The 12.7.0 release of PWA Studio provides customers with a better product selection experience by showing which variations of a configurable product are out of stock. This addition prevents customers from selecting out of stock variations when configuring a product for purchase. -## 12.6.0 Lighthouse scores +This release also adds and improves several keyboard and screen-reader accessibility features along with user session and permission bug fixes. Full details are described below. -With each new release of PWA Studio, we perform Lighthouse audits of four Venia page types, each representing a different level of complexity. Shown below are the Lighthouse scores for the 12.6.0 release of these pages on desktop and mobile devices. +## New Features + +- **Out-of-stock for product variations** [3903][] — The out-of-stock setting can now be applied to configurable product variations, making it easier for customers to configure a product with the available variations. +- **Tailwind theming documentation** [155][] — New instructions on how to install, configure, and use Tailwind with Venia to theme your own PWA Studio app. See [Tailwind Theming for PWA Studio apps](https://developer.adobe.com/commerce/pwa-studio/guides/theming/). +- **Accessible Action menus** [3791][] — Action menu functions are now accessible by keyboard. +- **Accessible Search results content** [3891][] —Screen reading of search results has been improved. +- **Accessible Search results count** [3935][] — Screen reader announces the total items found in the searched result. +- **Accessible UI Control states** [3792][] — Screen readers now announce the expanded and collapsed states of controls. +- **Accessible Mega Menu** [3798][] — The Mega Menu is now accessible by keyboard. +- **Accessible Actionable UI elements** [3864][] — When actionable UI elements receive focus, a visible focus indicator is present. +- **Accessible Logo component** [3936][] — The Logo component now renders the `alt` property. + +## Bug Fixes + +- **Fixed selected payment method** [3969][] — The selected payment method now persists during the user session, when multiple payment methods are available. +- **Fixed permission error** [3955][] — Fixed a permission error that occurred during the compilation process initiated by Docker. +- **Fixed import typo** [3648][] — Fixed a typo for the import name of a component. +- **Fixed console warnings** [3942][] — Fixed console warnings for invalid DOM property names. + +## 12.7.0 Lighthouse scores + +With each new release of PWA Studio, we perform Lighthouse audits of four Venia page types, each representing a different level of complexity. Shown below are the Lighthouse scores for the 12.7.0 release of these pages on desktop and mobile devices. ### Desktop scores @@ -46,57 +55,62 @@ With each new release of PWA Studio, we perform Lighthouse audits of four Venia | SEO | ![](images/score_100.svg) | ![](images/score_100.svg) | ![](images/score_100.svg) | ![](images/score_100.svg) | | PWA | ![](images/pwa_perfect.svg) | ![](images/pwa_imperfect.svg) | ![](images/pwa_imperfect.svg) | ![](images/pwa_perfect.svg) | +## Known issue + +When a user logs out, that user's local storage session persists. As a result, the cart ID from the logged out user is retrieved and given to the _guest user_ on the computer. This causes the following error when the guest user tries to check out: `An error has occurred. Please check the input and try again.` To resolve this issue, try disabling graphql session sharing as described in the GraphQL documentation on session cookies here: https://devdocs.magento.com/guides/v2.4/graphql/authorization-tokens.html#session-cookies. + ## Upgrading from a previous version -Use the steps outlined in this section to update your [scaffolded project][] from 12.5.0 to 12.6.0. +Use the steps outlined in this section to update your [scaffolded project][] from 12.6.0 to 12.7.0. See [Upgrading versions][] for more information about upgrading between PWA Studio versions. [scaffolded project]: https://developer.adobe.com/commerce/pwa-studio/tutorials/ [upgrading versions]: https://developer.adobe.com/commerce/pwa-studio/guides/upgrading-versions/ -### Update dependencies +### Updated package dependencies Open your `package.json` file and update the PWA Studio package dependencies to the versions associated with this release. -The following table lists the latest versions of each package as of 12.6.0. +The following table lists the latest versions of each package as of 12.7.0. The **bolded** versions with an asterisk (*) are the packages that were updated from PWA Studio 12.6.0. **Note:** Your project may not depend on some packages listed in this table. | Package | Latest version | |-------------------------------------|----------------| -| `babel-preset-peregrine` | **1.2.1** | -| `create-pwa` | **2.3.2** | -| `experience-platform-connector` | **1.0.1** | -| `upward-security-headers` | **1.0.10** | -| `venia-sample-backends` | **0.0.8** | -| `venia-sample-eventing` | **0.0.2** | -| `venia-sample-language-packs` | **0.0.10** | -| `venia-sample-payments-checkmo` | **0.0.8** | -| `pagebuilder` | **7.5.0** | -| `peregrine` | **12.5.0** | -| `pwa-buildpack` | **11.4.0** | -| `pwa-theme-venia` | **1.4.0** | -| `upward-js` | **5.4.0** | -| `upward-spec` | **5.2.1** | -| `venia-concept` | **12.6.0** | -| `venia-ui` | **9.6.0** | -| `magento2-pwa` | **0.3.0** | -| `magento2-pwa-commerce` | **0.0.2** | -| `magento-venia-sample-data-modules` | **0.0.3** | -| `magento-venia-sample-data-modules-ee`| **0.0.2** | -| `magento2-upward-connector` | **2.0.1** | -| `upward-php` | **2.0.1** | - -[3785]: https://github.com/magento/pwa-studio/pull/3785 -[3805]: https://github.com/magento/pwa-studio/pull/3805 -[3787]: https://github.com/magento/pwa-studio/pull/3787 -[3786]: https://github.com/magento/pwa-studio/pull/3786 -[29]: https://github.com/magento-commerce/magento2-pwa/pull/29 -[3911]: https://github.com/magento/pwa-studio/pull/3911 -[3912]: https://github.com/magento/pwa-studio/pull/3912 -[3800]: https://github.com/magento/pwa-studio/pull/3800 -[30]: https://github.com/magento-commerce/magento2-pwa/pull/30 -[3925]: https://github.com/magento/pwa-studio/pull/3925 -[29]: https://github.com/magento-commerce/magento2-pwa/pull/29 +| `babel-preset-peregrine` | **1.2.2*** | +| `create-pwa` | **2.3.3*** | +| `experience-platform-connector` | **1.0.2*** | +| `upward-security-headers` | **1.0.11*** | +| `venia-sample-backends` | **0.0.9*** | +| `venia-sample-eventing` | **0.0.3*** | +| `venia-sample-language-packs` | **0.0.11*** | +| `venia-sample-payments-checkmo` | **0.0.9*** | +| `pagebuilder` | **7.4.2*** | +| `peregrine` | **12.6.0*** | +| `pwa-buildpack` | **11.4.1*** | +| `pwa-theme-venia` | **1.4.0*** | +| `upward-js` | 5.3.2 | +| `upward-spec` | 5.2.1 | +| `venia-concept` | **12.7.0*** | +| `venia-ui` | **9.7.0*** | +| `magento2-pwa` | 0.3.0 | +| `magento2-pwa-commerce` | 0.0.2 | +| `magento-venia-sample-data-modules` | 0.0.3 | +| `magento-venia-sample-data-modules-ee`| 0.0.2 | +| `magento2-upward-connector` | 2.0.1 | +| `upward-php` | 2.0.1 | [PWA Studio releases]: https://github.com/magento/pwa-studio/releases +[155]: https://github.com/AdobeDocs/commerce-pwa-studio/pull/155 +[3791]: https://github.com/magento/pwa-studio/pull/3791 +[3903]: https://github.com/magento/pwa-studio/pull/3903 +[3798]: https://github.com/magento/pwa-studio/pull/3798 +[3792]: https://github.com/magento/pwa-studio/pull/3792 +[3891]: https://github.com/magento/pwa-studio/pull/3891 +[3864]: https://github.com/magento/pwa-studio/pull/3864 +[3935]: https://github.com/magento/pwa-studio/pull/3935 +[3942]: https://github.com/magento/pwa-studio/pull/3942 +[3648]: https://github.com/magento/pwa-studio/pull/3648 +[3955]: https://github.com/magento/pwa-studio/pull/3955 +[3969]: https://github.com/magento/pwa-studio/pull/3969 +[3936]: https://github.com/magento/pwa-studio/pull/3936 From de14d5b8eb45efa7cb3f5a8c5328b97f88ba6fcb Mon Sep 17 00:00:00 2001 From: devops-pwa-codebuild Date: Thu, 20 Oct 2022 22:06:44 +0000 Subject: [PATCH 05/17] v12.7.0-beta.1 --- package.json | 2 +- packages/babel-preset-peregrine/package.json | 2 +- packages/create-pwa/package.json | 6 +++--- .../experience-platform-connector/package.json | 6 +++--- .../upward-security-headers/package.json | 6 +++--- .../venia-sample-backends/package.json | 4 ++-- .../venia-sample-eventing/package.json | 6 +++--- .../venia-sample-language-packs/package.json | 6 +++--- .../venia-sample-payments-checkmo/package.json | 8 ++++---- packages/pagebuilder/package.json | 16 ++++++++-------- packages/peregrine/package.json | 2 +- packages/pwa-buildpack/package.json | 2 +- packages/pwa-theme-venia/package.json | 2 +- packages/venia-concept/package.json | 16 ++++++++-------- packages/venia-ui/package.json | 8 ++++---- pwa-devdocs/package.json | 2 +- 16 files changed, 47 insertions(+), 47 deletions(-) diff --git a/package.json b/package.json index 8cc3d11712..de049f7f6d 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pwa-studio", - "version": "12.7.0-alpha.1", + "version": "12.7.0-beta.1", "private": true, "workspaces": [ "packages/babel-preset-peregrine", diff --git a/packages/babel-preset-peregrine/package.json b/packages/babel-preset-peregrine/package.json index 2cb9296631..2a5365d21b 100644 --- a/packages/babel-preset-peregrine/package.json +++ b/packages/babel-preset-peregrine/package.json @@ -1,6 +1,6 @@ { "name": "@magento/babel-preset-peregrine", - "version": "1.2.1", + "version": "1.2.2-beta.1", "publishConfig": { "access": "public" }, diff --git a/packages/create-pwa/package.json b/packages/create-pwa/package.json index 9bfa032ad3..7eacaa778c 100644 --- a/packages/create-pwa/package.json +++ b/packages/create-pwa/package.json @@ -1,6 +1,6 @@ { "name": "@magento/create-pwa", - "version": "2.3.3-alpha.1", + "version": "2.3.3-beta.1", "publishConfig": { "access": "public" }, @@ -29,8 +29,8 @@ }, "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/create-pwa#readme", "dependencies": { - "@magento/pwa-buildpack": "~11.4.0", - "@magento/venia-concept": "12.7.0-alpha.1", + "@magento/pwa-buildpack": "11.4.1-beta.1", + "@magento/venia-concept": "12.7.0-beta.1", "chalk": "^2.4.2", "change-case": "^3.1.0", "compression": "~1.7.4", diff --git a/packages/extensions/experience-platform-connector/package.json b/packages/extensions/experience-platform-connector/package.json index 229ed8a218..1614729bed 100644 --- a/packages/extensions/experience-platform-connector/package.json +++ b/packages/extensions/experience-platform-connector/package.json @@ -1,6 +1,6 @@ { "name": "@magento/experience-platform-connector", - "version": "1.0.2-alpha.1", + "version": "1.0.2-beta.1", "publishConfig": { "access": "public" }, @@ -18,8 +18,8 @@ "devDependencies": {}, "peerDependencies": { "@apollo/client": "~3.5.0", - "@magento/peregrine": "12.6.0-alpha.1", - "@magento/pwa-buildpack": "~11.4.0", + "@magento/peregrine": "12.6.0-beta.1", + "@magento/pwa-buildpack": "11.4.1-beta.1", "react": "~17.0.1" }, "pwa-studio": { diff --git a/packages/extensions/upward-security-headers/package.json b/packages/extensions/upward-security-headers/package.json index d0da4f9d91..d6d12536ae 100644 --- a/packages/extensions/upward-security-headers/package.json +++ b/packages/extensions/upward-security-headers/package.json @@ -1,6 +1,6 @@ { "name": "@magento/upward-security-headers", - "version": "1.0.11-alpha.1", + "version": "1.0.11-beta.1", "publishConfig": { "access": "public" }, @@ -13,8 +13,8 @@ "author": "Adobe Commerce", "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { - "@magento/pwa-buildpack": "~11.4.0", - "@magento/venia-ui": "9.7.0-alpha.1", + "@magento/pwa-buildpack": "11.4.1-beta.1", + "@magento/venia-ui": "9.7.0-beta.1", "webpack": "~4.46.0" }, "pwa-studio": { diff --git a/packages/extensions/venia-sample-backends/package.json b/packages/extensions/venia-sample-backends/package.json index 940f0f3eec..192184e15c 100644 --- a/packages/extensions/venia-sample-backends/package.json +++ b/packages/extensions/venia-sample-backends/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-backends", - "version": "0.0.8", + "version": "0.0.9-beta.1", "publishConfig": { "access": "public" }, @@ -13,7 +13,7 @@ "repository": "github:magento/pwa-studio", "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { - "@magento/pwa-buildpack": "~11.4.0", + "@magento/pwa-buildpack": "11.4.1-beta.1", "node-fetch": "~2.3.0" }, "pwa-studio": { diff --git a/packages/extensions/venia-sample-eventing/package.json b/packages/extensions/venia-sample-eventing/package.json index 105987179c..6408f1c344 100644 --- a/packages/extensions/venia-sample-eventing/package.json +++ b/packages/extensions/venia-sample-eventing/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-eventing", - "version": "0.0.3-alpha.1", + "version": "0.0.3-beta.1", "publishConfig": { "access": "public" }, @@ -12,8 +12,8 @@ "repository": "github:magento/pwa-studio", "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { - "@magento/peregrine": "12.6.0-alpha.1", - "@magento/pwa-buildpack": "~11.4.0", + "@magento/peregrine": "12.6.0-beta.1", + "@magento/pwa-buildpack": "11.4.1-beta.1", "react": "~17.0.1" }, "pwa-studio": { diff --git a/packages/extensions/venia-sample-language-packs/package.json b/packages/extensions/venia-sample-language-packs/package.json index 4368afbfaf..2f8209808e 100644 --- a/packages/extensions/venia-sample-language-packs/package.json +++ b/packages/extensions/venia-sample-language-packs/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-language-packs", - "version": "0.0.11-alpha.1", + "version": "0.0.11-beta.1", "publishConfig": { "access": "public" }, @@ -12,8 +12,8 @@ "repository": "github:magento/pwa-studio", "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { - "@magento/pwa-buildpack": "~11.4.0", - "@magento/venia-ui": "9.7.0-alpha.1" + "@magento/pwa-buildpack": "11.4.1-beta.1", + "@magento/venia-ui": "9.7.0-beta.1" }, "pwa-studio": { "targets": { diff --git a/packages/extensions/venia-sample-payments-checkmo/package.json b/packages/extensions/venia-sample-payments-checkmo/package.json index 317bd2ac8d..e93db39326 100644 --- a/packages/extensions/venia-sample-payments-checkmo/package.json +++ b/packages/extensions/venia-sample-payments-checkmo/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-payments-checkmo", - "version": "0.0.9-alpha.1", + "version": "0.0.9-beta.1", "publishConfig": { "access": "public" }, @@ -12,9 +12,9 @@ "repository": "github:magento/pwa-studio", "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { - "@magento/peregrine": "12.6.0-alpha.1", - "@magento/pwa-buildpack": "~11.4.0", - "@magento/venia-ui": "9.7.0-alpha.1", + "@magento/peregrine": "12.6.0-beta.1", + "@magento/pwa-buildpack": "11.4.1-beta.1", + "@magento/venia-ui": "9.7.0-beta.1", "react": "~17.0.1", "react-intl": "~5.20.0", "react-router-dom": "~5.2.0" diff --git a/packages/pagebuilder/package.json b/packages/pagebuilder/package.json index 07fbb3bb79..66ecfa1898 100644 --- a/packages/pagebuilder/package.json +++ b/packages/pagebuilder/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pagebuilder", - "version": "7.4.2-alpha.1", + "version": "7.4.2-beta.1", "publishConfig": { "access": "public" }, @@ -34,9 +34,9 @@ "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/pagebuilder#readme", "dependencies": {}, "devDependencies": { - "@magento/peregrine": "12.6.0-alpha.1", - "@magento/pwa-buildpack": "~11.4.0", - "@magento/venia-ui": "9.7.0-alpha.1", + "@magento/peregrine": "12.6.0-beta.1", + "@magento/pwa-buildpack": "11.4.1-beta.1", + "@magento/venia-ui": "9.7.0-beta.1", "@storybook/react": "~6.3.7", "jarallax": "~1.11.1", "load-google-maps-api": "~2.0.1", @@ -49,10 +49,10 @@ }, "peerDependencies": { "@apollo/client": "~3.5.0", - "@magento/babel-preset-peregrine": "~1.2.1", - "@magento/peregrine": "12.6.0-alpha.1", - "@magento/pwa-buildpack": "~11.4.0", - "@magento/venia-ui": "9.7.0-alpha.1", + "@magento/babel-preset-peregrine": "1.2.2-beta.1", + "@magento/peregrine": "12.6.0-beta.1", + "@magento/pwa-buildpack": "11.4.1-beta.1", + "@magento/venia-ui": "9.7.0-beta.1", "jarallax": "~1.11.1", "load-google-maps-api": "~2.0.1", "lodash.escape": "~4.0.1", diff --git a/packages/peregrine/package.json b/packages/peregrine/package.json index 77132dac8e..9f605a5047 100644 --- a/packages/peregrine/package.json +++ b/packages/peregrine/package.json @@ -1,6 +1,6 @@ { "name": "@magento/peregrine", - "version": "12.6.0-alpha.1", + "version": "12.6.0-beta.1", "publishConfig": { "access": "public" }, diff --git a/packages/pwa-buildpack/package.json b/packages/pwa-buildpack/package.json index 33b1005e11..23d77db303 100644 --- a/packages/pwa-buildpack/package.json +++ b/packages/pwa-buildpack/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pwa-buildpack", - "version": "11.4.0", + "version": "11.4.1-beta.1", "publishConfig": { "access": "public" }, diff --git a/packages/pwa-theme-venia/package.json b/packages/pwa-theme-venia/package.json index 0d37f42209..5df89e6e40 100644 --- a/packages/pwa-theme-venia/package.json +++ b/packages/pwa-theme-venia/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pwa-theme-venia", - "version": "1.4.0-alpha.1", + "version": "1.4.0-beta.1", "publishConfig": { "access": "public" }, diff --git a/packages/venia-concept/package.json b/packages/venia-concept/package.json index 25b7f8d87c..80eddc88c4 100644 --- a/packages/venia-concept/package.json +++ b/packages/venia-concept/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-concept", - "version": "12.7.0-alpha.1", + "version": "12.7.0-beta.1", "publishConfig": { "access": "public" }, @@ -35,7 +35,7 @@ }, "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/venia-concept#readme", "dependencies": { - "@magento/pwa-buildpack": "~11.4.0" + "@magento/pwa-buildpack": "11.4.1-beta.1" }, "devDependencies": { "@adobe/apollo-link-mutation-queue": "~1.0.2", @@ -50,13 +50,13 @@ "@babel/plugin-transform-runtime": "~7.4.4", "@babel/preset-env": "~7.16.0", "@babel/runtime": "~7.15.3", - "@magento/babel-preset-peregrine": "~1.2.1", + "@magento/babel-preset-peregrine": "1.2.2-beta.1", "@magento/eslint-config": "~1.5.0", - "@magento/pagebuilder": "7.4.2-alpha.1", - "@magento/peregrine": "12.6.0-alpha.1", - "@magento/pwa-theme-venia": "1.4.0-alpha.1", - "@magento/upward-security-headers": "1.0.11-alpha.1", - "@magento/venia-ui": "9.7.0-alpha.1", + "@magento/pagebuilder": "7.4.2-beta.1", + "@magento/peregrine": "12.6.0-beta.1", + "@magento/pwa-theme-venia": "1.4.0-beta.1", + "@magento/upward-security-headers": "1.0.11-beta.1", + "@magento/venia-ui": "9.7.0-beta.1", "@pmmmwh/react-refresh-webpack-plugin": "0.4.1", "@storybook/react": "~6.3.7", "@types/node": "16", diff --git a/packages/venia-ui/package.json b/packages/venia-ui/package.json index dde74bac23..5a4ded28ac 100644 --- a/packages/venia-ui/package.json +++ b/packages/venia-ui/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-ui", - "version": "9.7.0-alpha.1", + "version": "9.7.0-beta.1", "publishConfig": { "access": "public" }, @@ -79,9 +79,9 @@ }, "peerDependencies": { "@apollo/client": "~3.5.0", - "@magento/babel-preset-peregrine": "~1.2.1", - "@magento/peregrine": "12.6.0-alpha.1", - "@magento/pwa-buildpack": "~11.4.0", + "@magento/babel-preset-peregrine": "1.2.2-beta.1", + "@magento/peregrine": "12.6.0-beta.1", + "@magento/pwa-buildpack": "11.4.1-beta.1", "apollo-cache-persist": "~0.1.1", "braintree-web-drop-in": "~1.33.3", "graphql": "~15.5.0", diff --git a/pwa-devdocs/package.json b/pwa-devdocs/package.json index 5673778fed..b4ac1d61a0 100644 --- a/pwa-devdocs/package.json +++ b/pwa-devdocs/package.json @@ -1,7 +1,7 @@ { "name": "pwa-devdocs", "private": true, - "version": "12.7.0-alpha.1", + "version": "12.7.0-beta.1", "description": "A documentation site for Magento PWA", "main": "gulpfile.js", "dependencies": { From 3d4e958734365593a54c48582dd766866c7e27cd Mon Sep 17 00:00:00 2001 From: Justin Conabree <68294336+JustinConabreeAbsolunet@users.noreply.github.com> Date: Wed, 2 Nov 2022 15:53:07 -0400 Subject: [PATCH 06/17] Jconabree/issue 3873 talon exports (#3874) * Issue 3873 - Changing exports to named instead of default so wraps work correctly * Fixing exports of hooks Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> --- .../pagebuilder/lib/ContentTypes/Banner/banner.js | 2 +- .../hooks/__tests__/useDelayedTransition.spec.js | 2 +- .../lib/hooks/__tests__/useInternalLink.spec.js | 2 +- .../__tests__/useIntersectionObserver.spec.js | 2 +- .../lib/hooks/__tests__/useScript.spec.js | 2 +- .../peregrine/lib/hooks/useDelayedTransition.js | 4 +--- .../__tests__/useGoogleReCaptcha.spec.js | 2 +- .../hooks/useGoogleReCaptcha/useGoogleReCaptcha.js | 2 +- packages/peregrine/lib/hooks/useInternalLink.js | 2 +- .../peregrine/lib/hooks/useIntersectionObserver.js | 2 +- packages/peregrine/lib/hooks/useIsInViewport.js | 2 +- packages/peregrine/lib/hooks/useScript.js | 2 +- .../Breadcrumbs/__tests__/useBreadcrumbs.spec.js | 6 +++--- .../lib/talons/Breadcrumbs/useBreadcrumbs.js | 2 +- .../CategoryList/__tests__/useCategoryTile.spec.js | 6 +++--- .../lib/talons/CategoryList/useCategoryTile.js | 2 +- .../ContactPage/__tests__/useContactLink.spec.js | 2 +- .../ContactPage/__tests__/useContactPage.spec.js | 2 +- packages/peregrine/lib/talons/ContactPage/index.js | 4 ++-- .../lib/talons/ContactPage/useContactLink.js | 2 +- .../lib/talons/ContactPage/useContactPage.js | 2 +- .../peregrine/lib/talons/Gallery/useGalleryItem.js | 2 +- .../lib/talons/Link/__tests__/useLink.spec.js | 8 +++++--- packages/peregrine/lib/talons/Link/useLink.js | 6 ++---- .../talons/MegaMenu/__tests__/useMegaMenu.spec.js | 6 +++--- .../peregrine/lib/talons/MegaMenu/useMegaMenu.js | 2 +- .../lib/talons/Navigation/useNavigation.js | 2 +- .../__tests__/usePageLoadingIndicator.spec.js | 2 +- .../usePageLoadingIndicator.js | 2 +- .../lib/components/App/__tests__/app.spec.js | 4 +++- packages/venia-ui/lib/components/App/app.js | 2 +- .../lib/components/Link/__tests__/link.spec.js | 14 ++++++++------ packages/venia-ui/lib/components/Link/link.js | 2 +- .../__tests__/pageLoadingIndicator.spec.js | 2 +- .../PageLoadingIndicator/pageLoadingIndicator.js | 2 +- 35 files changed, 56 insertions(+), 54 deletions(-) diff --git a/packages/pagebuilder/lib/ContentTypes/Banner/banner.js b/packages/pagebuilder/lib/ContentTypes/Banner/banner.js index e38907e106..10c3e1df32 100644 --- a/packages/pagebuilder/lib/ContentTypes/Banner/banner.js +++ b/packages/pagebuilder/lib/ContentTypes/Banner/banner.js @@ -6,7 +6,7 @@ import Button from '@magento/venia-ui/lib/components/Button/button'; import resolveLinkProps from '@magento/peregrine/lib/util/resolveLinkProps'; import { Link, useHistory } from 'react-router-dom'; import resourceUrl from '@magento/peregrine/lib/util/makeUrl'; -import useIntersectionObserver from '@magento/peregrine/lib/hooks/useIntersectionObserver'; +import { useIntersectionObserver } from '@magento/peregrine/lib/hooks/useIntersectionObserver'; import { useMediaQuery } from '@magento/peregrine/lib/hooks/useMediaQuery'; import handleHtmlContentClick from '../../handleHtmlContentClick'; diff --git a/packages/peregrine/lib/hooks/__tests__/useDelayedTransition.spec.js b/packages/peregrine/lib/hooks/__tests__/useDelayedTransition.spec.js index 0a95d609c8..6e681a34cb 100644 --- a/packages/peregrine/lib/hooks/__tests__/useDelayedTransition.spec.js +++ b/packages/peregrine/lib/hooks/__tests__/useDelayedTransition.spec.js @@ -8,7 +8,7 @@ import { mockSetPageLoading } from '@magento/peregrine/lib/context/app'; import { mockSetComponentMap } from '@magento/peregrine/lib/context/rootComponents'; import { getRootComponent } from '../../talons/MagentoRoute/helpers'; -import useDelayedTransition from '../useDelayedTransition'; +import { useDelayedTransition } from '../useDelayedTransition'; // jest.mock('react'); diff --git a/packages/peregrine/lib/hooks/__tests__/useInternalLink.spec.js b/packages/peregrine/lib/hooks/__tests__/useInternalLink.spec.js index 58642065b5..994963eead 100644 --- a/packages/peregrine/lib/hooks/__tests__/useInternalLink.spec.js +++ b/packages/peregrine/lib/hooks/__tests__/useInternalLink.spec.js @@ -1,5 +1,5 @@ import { useAppContext } from '../../context/app'; -import useInternalLink, { SHIMMER_TYPE_SUFFIX } from '../useInternalLink'; +import { useInternalLink, SHIMMER_TYPE_SUFFIX } from '../useInternalLink'; jest.mock('../../context/app', () => ({ useAppContext: jest.fn() diff --git a/packages/peregrine/lib/hooks/__tests__/useIntersectionObserver.spec.js b/packages/peregrine/lib/hooks/__tests__/useIntersectionObserver.spec.js index 68da117640..9428c3afda 100644 --- a/packages/peregrine/lib/hooks/__tests__/useIntersectionObserver.spec.js +++ b/packages/peregrine/lib/hooks/__tests__/useIntersectionObserver.spec.js @@ -1,7 +1,7 @@ import React, { useEffect } from 'react'; import { createTestInstance } from '@magento/peregrine'; -import useIntersectionObserver from '../useIntersectionObserver'; +import { useIntersectionObserver } from '../useIntersectionObserver'; const log = jest.fn(); diff --git a/packages/peregrine/lib/hooks/__tests__/useScript.spec.js b/packages/peregrine/lib/hooks/__tests__/useScript.spec.js index b45a5fd45e..9d465fe416 100644 --- a/packages/peregrine/lib/hooks/__tests__/useScript.spec.js +++ b/packages/peregrine/lib/hooks/__tests__/useScript.spec.js @@ -1,6 +1,6 @@ import { act, renderHook } from '@testing-library/react-hooks'; -import useScript from '../useScript'; +import { useScript } from '../useScript'; describe('#useScript', () => { it('returns idle if script not provided', () => { diff --git a/packages/peregrine/lib/hooks/useDelayedTransition.js b/packages/peregrine/lib/hooks/useDelayedTransition.js index 22cc673b5a..a78c07cd9a 100644 --- a/packages/peregrine/lib/hooks/useDelayedTransition.js +++ b/packages/peregrine/lib/hooks/useDelayedTransition.js @@ -14,7 +14,7 @@ import { getRootComponent } from '../talons/MagentoRoute/helpers'; const DELAY_MESSAGE_PREFIX = 'DELAY:'; -const useDelayedTransition = () => { +export const useDelayedTransition = () => { const { pathname } = useLocation(); const history = useHistory(); const client = useApolloClient(); @@ -123,5 +123,3 @@ const useDelayedTransition = () => { }; }, [client, resolveUrlQuery, setComponentMap, setPageLoading]); }; - -export default useDelayedTransition; diff --git a/packages/peregrine/lib/hooks/useGoogleReCaptcha/__tests__/useGoogleReCaptcha.spec.js b/packages/peregrine/lib/hooks/useGoogleReCaptcha/__tests__/useGoogleReCaptcha.spec.js index 0b21098635..2636963922 100644 --- a/packages/peregrine/lib/hooks/useGoogleReCaptcha/__tests__/useGoogleReCaptcha.spec.js +++ b/packages/peregrine/lib/hooks/useGoogleReCaptcha/__tests__/useGoogleReCaptcha.spec.js @@ -11,7 +11,7 @@ import { useGoogleReCaptcha } from '../useGoogleReCaptcha'; jest.mock('@magento/peregrine/lib/hooks/useScript', () => { return { __esModule: true, - default: jest.fn().mockImplementation(() => { + useScript: jest.fn().mockImplementation(() => { return 'ready'; }) }; diff --git a/packages/peregrine/lib/hooks/useGoogleReCaptcha/useGoogleReCaptcha.js b/packages/peregrine/lib/hooks/useGoogleReCaptcha/useGoogleReCaptcha.js index 5a8911614c..8929e2ef1c 100644 --- a/packages/peregrine/lib/hooks/useGoogleReCaptcha/useGoogleReCaptcha.js +++ b/packages/peregrine/lib/hooks/useGoogleReCaptcha/useGoogleReCaptcha.js @@ -1,7 +1,7 @@ import { useCallback, useEffect, useState } from 'react'; import { useQuery } from '@apollo/client'; -import useScript from '@magento/peregrine/lib/hooks/useScript'; +import { useScript } from '@magento/peregrine/lib/hooks/useScript'; import mergeOperations from '@magento/peregrine/lib/util/shallowMerge'; import defaultOperations from './googleReCaptchaConfig.gql'; diff --git a/packages/peregrine/lib/hooks/useInternalLink.js b/packages/peregrine/lib/hooks/useInternalLink.js index 63c0e656a5..769356ff08 100644 --- a/packages/peregrine/lib/hooks/useInternalLink.js +++ b/packages/peregrine/lib/hooks/useInternalLink.js @@ -3,7 +3,7 @@ import { useAppContext } from '../context/app'; export const SHIMMER_TYPE_SUFFIX = '_SHIMMER'; -export default rootType => { +export const useInternalLink = rootType => { const [, appApi] = useAppContext(); const { actions: appActions } = appApi; const { setNextRootComponent } = appActions; diff --git a/packages/peregrine/lib/hooks/useIntersectionObserver.js b/packages/peregrine/lib/hooks/useIntersectionObserver.js index 2e79d2c759..97c75e1f1c 100644 --- a/packages/peregrine/lib/hooks/useIntersectionObserver.js +++ b/packages/peregrine/lib/hooks/useIntersectionObserver.js @@ -1,4 +1,4 @@ -export default () => { +export const useIntersectionObserver = () => { if (typeof IntersectionObserver === 'undefined') { return; } diff --git a/packages/peregrine/lib/hooks/useIsInViewport.js b/packages/peregrine/lib/hooks/useIsInViewport.js index a912129600..8f2556d502 100644 --- a/packages/peregrine/lib/hooks/useIsInViewport.js +++ b/packages/peregrine/lib/hooks/useIsInViewport.js @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react'; -import useIntersectionObserver from '@magento/peregrine/lib/hooks/useIntersectionObserver'; +import { useIntersectionObserver } from '@magento/peregrine/lib/hooks/useIntersectionObserver'; export const useIsInViewport = props => { const { elementRef, renderOnce = true } = props; diff --git a/packages/peregrine/lib/hooks/useScript.js b/packages/peregrine/lib/hooks/useScript.js index 3c85d78cdb..daf5324512 100644 --- a/packages/peregrine/lib/hooks/useScript.js +++ b/packages/peregrine/lib/hooks/useScript.js @@ -8,7 +8,7 @@ import { useState, useEffect } from 'react'; * * @returns {string} - returns one of the possible status: "idle", "loading", "ready" or "error" */ -export default src => { +export const useScript = src => { // Keep track of script status ("idle", "loading", "ready", "error") const [status, setStatus] = useState(src ? 'loading' : 'idle'); useEffect( diff --git a/packages/peregrine/lib/talons/Breadcrumbs/__tests__/useBreadcrumbs.spec.js b/packages/peregrine/lib/talons/Breadcrumbs/__tests__/useBreadcrumbs.spec.js index a997513cc2..de2ed2900e 100644 --- a/packages/peregrine/lib/talons/Breadcrumbs/__tests__/useBreadcrumbs.spec.js +++ b/packages/peregrine/lib/talons/Breadcrumbs/__tests__/useBreadcrumbs.spec.js @@ -43,11 +43,11 @@ jest.mock('@apollo/client', () => { }; }); -jest.mock('../../../hooks/useInternalLink', () => - jest.fn(() => ({ +jest.mock('../../../hooks/useInternalLink', () => ({ + useInternalLink: jest.fn(() => ({ setShimmerType: jest.fn() })) -); +})); const storeConfigResponse = { data: { diff --git a/packages/peregrine/lib/talons/Breadcrumbs/useBreadcrumbs.js b/packages/peregrine/lib/talons/Breadcrumbs/useBreadcrumbs.js index 9f904cf184..2822bc8eac 100644 --- a/packages/peregrine/lib/talons/Breadcrumbs/useBreadcrumbs.js +++ b/packages/peregrine/lib/talons/Breadcrumbs/useBreadcrumbs.js @@ -1,6 +1,6 @@ import { useMemo } from 'react'; import { useQuery } from '@apollo/client'; -import useInternalLink from '../../hooks/useInternalLink'; +import { useInternalLink } from '../../hooks/useInternalLink'; import mergeOperations from '../../util/shallowMerge'; diff --git a/packages/peregrine/lib/talons/CategoryList/__tests__/useCategoryTile.spec.js b/packages/peregrine/lib/talons/CategoryList/__tests__/useCategoryTile.spec.js index 3d09b10a38..5b91a5864d 100644 --- a/packages/peregrine/lib/talons/CategoryList/__tests__/useCategoryTile.spec.js +++ b/packages/peregrine/lib/talons/CategoryList/__tests__/useCategoryTile.spec.js @@ -30,11 +30,11 @@ const props = { const log = jest.fn(); -jest.mock('../../../hooks/useInternalLink', () => - jest.fn(() => ({ +jest.mock('../../../hooks/useInternalLink', () => ({ + useInternalLink: jest.fn(() => ({ setShimmerType: jest.fn() })) -); +})); const Component = props => { const talonProps = useCategoryTile(props); diff --git a/packages/peregrine/lib/talons/CategoryList/useCategoryTile.js b/packages/peregrine/lib/talons/CategoryList/useCategoryTile.js index a80cacf9bc..f9be442fd6 100644 --- a/packages/peregrine/lib/talons/CategoryList/useCategoryTile.js +++ b/packages/peregrine/lib/talons/CategoryList/useCategoryTile.js @@ -1,7 +1,7 @@ /* Deprecated in PWA-12.1.0*/ import { useMemo } from 'react'; -import useInternalLink from '../../hooks/useInternalLink'; +import { useInternalLink } from '../../hooks/useInternalLink'; const previewImageSize = 480; diff --git a/packages/peregrine/lib/talons/ContactPage/__tests__/useContactLink.spec.js b/packages/peregrine/lib/talons/ContactPage/__tests__/useContactLink.spec.js index 992729c332..f22b38c341 100644 --- a/packages/peregrine/lib/talons/ContactPage/__tests__/useContactLink.spec.js +++ b/packages/peregrine/lib/talons/ContactPage/__tests__/useContactLink.spec.js @@ -1,7 +1,7 @@ import React from 'react'; import { createTestInstance } from '@magento/peregrine'; import { useQuery } from '@apollo/client'; -import useContactLink from '../useContactLink'; +import { useContactLink } from '../useContactLink'; jest.mock('@apollo/client', () => ({ useQuery: jest.fn() diff --git a/packages/peregrine/lib/talons/ContactPage/__tests__/useContactPage.spec.js b/packages/peregrine/lib/talons/ContactPage/__tests__/useContactPage.spec.js index d6c54a98eb..c055433e39 100644 --- a/packages/peregrine/lib/talons/ContactPage/__tests__/useContactPage.spec.js +++ b/packages/peregrine/lib/talons/ContactPage/__tests__/useContactPage.spec.js @@ -2,7 +2,7 @@ import React from 'react'; import { createTestInstance } from '@magento/peregrine'; import { useMutation, useQuery } from '@apollo/client'; -import useContactPage from '../useContactPage'; +import { useContactPage } from '../useContactPage'; /* * Mocks. diff --git a/packages/peregrine/lib/talons/ContactPage/index.js b/packages/peregrine/lib/talons/ContactPage/index.js index 3feb5f96ea..4a395f25d3 100644 --- a/packages/peregrine/lib/talons/ContactPage/index.js +++ b/packages/peregrine/lib/talons/ContactPage/index.js @@ -1,2 +1,2 @@ -export { default as useContactPage } from './useContactPage'; -export { default as useContactLink } from './useContactLink'; +export { useContactPage } from './useContactPage'; +export { useContactLink } from './useContactLink'; diff --git a/packages/peregrine/lib/talons/ContactPage/useContactLink.js b/packages/peregrine/lib/talons/ContactPage/useContactLink.js index 81bd2cba1e..e3c7b7547e 100644 --- a/packages/peregrine/lib/talons/ContactPage/useContactLink.js +++ b/packages/peregrine/lib/talons/ContactPage/useContactLink.js @@ -3,7 +3,7 @@ import { useQuery } from '@apollo/client'; import mergeOperations from '@magento/peregrine/lib/util/shallowMerge'; import DEFAULT_OPERATIONS from './contactUs.gql'; -export default (props = {}) => { +export const useContactLink = (props = {}) => { const { getStoreConfigQuery } = mergeOperations( DEFAULT_OPERATIONS, props.operations diff --git a/packages/peregrine/lib/talons/ContactPage/useContactPage.js b/packages/peregrine/lib/talons/ContactPage/useContactPage.js index 619b4629ae..19c1ec2794 100644 --- a/packages/peregrine/lib/talons/ContactPage/useContactPage.js +++ b/packages/peregrine/lib/talons/ContactPage/useContactPage.js @@ -3,7 +3,7 @@ import { useMutation, useQuery } from '@apollo/client'; import mergeOperations from '@magento/peregrine/lib/util/shallowMerge'; import DEFAULT_OPERATIONS from './contactUs.gql'; -export default props => { +export const useContactPage = props => { const { cmsBlockIdentifiers = [], operations } = props; const { contactMutation, diff --git a/packages/peregrine/lib/talons/Gallery/useGalleryItem.js b/packages/peregrine/lib/talons/Gallery/useGalleryItem.js index 1642c8edeb..0fc21372fd 100644 --- a/packages/peregrine/lib/talons/Gallery/useGalleryItem.js +++ b/packages/peregrine/lib/talons/Gallery/useGalleryItem.js @@ -1,7 +1,7 @@ import { isSupportedProductType as isSupported } from '@magento/peregrine/lib/util/isSupportedProductType'; import { useEventingContext } from '@magento/peregrine/lib/context/eventing'; import { useCallback, useEffect, useRef } from 'react'; -import useIntersectionObserver from '@magento/peregrine/lib/hooks/useIntersectionObserver'; +import { useIntersectionObserver } from '@magento/peregrine/lib/hooks/useIntersectionObserver'; export const useGalleryItem = (props = {}) => { const [, { dispatch }] = useEventingContext(); diff --git a/packages/peregrine/lib/talons/Link/__tests__/useLink.spec.js b/packages/peregrine/lib/talons/Link/__tests__/useLink.spec.js index 6f65bd4f91..3b3bd951d7 100644 --- a/packages/peregrine/lib/talons/Link/__tests__/useLink.spec.js +++ b/packages/peregrine/lib/talons/Link/__tests__/useLink.spec.js @@ -1,8 +1,8 @@ import React, { useRef } from 'react'; import { act, create } from 'react-test-renderer'; import { useLazyQuery } from '@apollo/client'; -import useLink from '../useLink'; -import useIntersectionObserver from '../../../hooks/useIntersectionObserver'; +import { useLink } from '../useLink'; +import { useIntersectionObserver } from '../../../hooks/useIntersectionObserver'; jest.mock('react', () => { const react = jest.requireActual('react'); @@ -34,7 +34,9 @@ jest.mock('../../../util/makeUrl', () => }) ); -jest.mock('../../../hooks/useIntersectionObserver'); +jest.mock('../../../hooks/useIntersectionObserver', () => ({ + useIntersectionObserver: jest.fn() +})); const mockIntersectionObserve = jest.fn(); const mockIntersectionUnobserve = jest.fn(); diff --git a/packages/peregrine/lib/talons/Link/useLink.js b/packages/peregrine/lib/talons/Link/useLink.js index 34ee41a4cf..3bccd64ac0 100644 --- a/packages/peregrine/lib/talons/Link/useLink.js +++ b/packages/peregrine/lib/talons/Link/useLink.js @@ -1,11 +1,11 @@ import { useEffect, useRef } from 'react'; import { useLazyQuery } from '@apollo/client'; -import useIntersectionObserver from '../../hooks/useIntersectionObserver'; +import { useIntersectionObserver } from '../../hooks/useIntersectionObserver'; import resourceUrl from '../../util/makeUrl'; import mergeOperations from '../../util/shallowMerge'; import DEFAULT_OPERATIONS from '../MagentoRoute/magentoRoute.gql'; -const useLink = (props, passedOperations = {}) => { +export const useLink = (props, passedOperations = {}) => { const { innerRef: originalRef, to } = props; const shouldPrefetch = props.prefetchType || props.shouldPrefetch; const operations = shouldPrefetch @@ -65,5 +65,3 @@ const useLink = (props, passedOperations = {}) => { ref: elementRef }; }; - -export default useLink; diff --git a/packages/peregrine/lib/talons/MegaMenu/__tests__/useMegaMenu.spec.js b/packages/peregrine/lib/talons/MegaMenu/__tests__/useMegaMenu.spec.js index 3f97b6c6ba..cc4abdd6c1 100644 --- a/packages/peregrine/lib/talons/MegaMenu/__tests__/useMegaMenu.spec.js +++ b/packages/peregrine/lib/talons/MegaMenu/__tests__/useMegaMenu.spec.js @@ -11,11 +11,11 @@ jest.mock('react-router-dom', () => ({ useLocation: jest.fn(() => ({ pathname: '/venia-tops.html' })) })); -jest.mock('../../../hooks/useInternalLink', () => - jest.fn(() => ({ +jest.mock('../../../hooks/useInternalLink', () => ({ + useInternalLink: jest.fn(() => ({ setShimmerType: jest.fn().mockName('onNavigate') })) -); +})); jest.mock('../../../hooks/useEventListener', () => ({ useEventListener: jest.fn() diff --git a/packages/peregrine/lib/talons/MegaMenu/useMegaMenu.js b/packages/peregrine/lib/talons/MegaMenu/useMegaMenu.js index e9e1e70b36..544c9583e5 100644 --- a/packages/peregrine/lib/talons/MegaMenu/useMegaMenu.js +++ b/packages/peregrine/lib/talons/MegaMenu/useMegaMenu.js @@ -1,6 +1,6 @@ import { useMemo, useState, useCallback, useEffect } from 'react'; import { useLocation } from 'react-router-dom'; -import useInternalLink from '../../hooks/useInternalLink'; +import { useInternalLink } from '../../hooks/useInternalLink'; import { useQuery } from '@apollo/client'; import { useEventListener } from '../../hooks/useEventListener'; diff --git a/packages/peregrine/lib/talons/Navigation/useNavigation.js b/packages/peregrine/lib/talons/Navigation/useNavigation.js index 040423b4b3..6eb8cb03ab 100644 --- a/packages/peregrine/lib/talons/Navigation/useNavigation.js +++ b/packages/peregrine/lib/talons/Navigation/useNavigation.js @@ -6,7 +6,7 @@ import { useAppContext } from '../../context/app'; import { useCatalogContext } from '../../context/catalog'; import { useUserContext } from '../../context/user'; import { useAwaitQuery } from '../../hooks/useAwaitQuery'; -import useInternalLink from '../../hooks/useInternalLink'; +import { useInternalLink } from '../../hooks/useInternalLink'; import DEFAULT_OPERATIONS from './navigation.gql'; diff --git a/packages/peregrine/lib/talons/PageLoadingIndicator/__tests__/usePageLoadingIndicator.spec.js b/packages/peregrine/lib/talons/PageLoadingIndicator/__tests__/usePageLoadingIndicator.spec.js index 66213de857..03a428cf4c 100644 --- a/packages/peregrine/lib/talons/PageLoadingIndicator/__tests__/usePageLoadingIndicator.spec.js +++ b/packages/peregrine/lib/talons/PageLoadingIndicator/__tests__/usePageLoadingIndicator.spec.js @@ -1,7 +1,7 @@ import React from 'react'; import { act, create } from 'react-test-renderer'; import { useAppContext } from '../../../context/app'; -import usePageLoadingIndicator from '../usePageLoadingIndicator'; +import { usePageLoadingIndicator } from '../usePageLoadingIndicator'; jest.mock('../../../context/app', () => { return { diff --git a/packages/peregrine/lib/talons/PageLoadingIndicator/usePageLoadingIndicator.js b/packages/peregrine/lib/talons/PageLoadingIndicator/usePageLoadingIndicator.js index f170c6a8ad..d3c344f8fb 100644 --- a/packages/peregrine/lib/talons/PageLoadingIndicator/usePageLoadingIndicator.js +++ b/packages/peregrine/lib/talons/PageLoadingIndicator/usePageLoadingIndicator.js @@ -3,7 +3,7 @@ import { useAppContext } from '../../context/app'; const GROUP_LOADING_DELAY = 750; -export default () => { +export const usePageLoadingIndicator = () => { const [{ isPageLoading }] = useAppContext(); const doneTimeoutRef = useRef(); const [loadingState, setLoadingState] = useState('off'); diff --git a/packages/venia-ui/lib/components/App/__tests__/app.spec.js b/packages/venia-ui/lib/components/App/__tests__/app.spec.js index 320b108283..196d080bb5 100644 --- a/packages/venia-ui/lib/components/App/__tests__/app.spec.js +++ b/packages/venia-ui/lib/components/App/__tests__/app.spec.js @@ -19,7 +19,9 @@ jest.mock('../../Navigation', () => 'Navigation'); jest.mock('../../Routes', () => 'Routes'); jest.mock('../../ToastContainer', () => 'ToastContainer'); jest.mock('@magento/peregrine/lib/hooks/useDelayedTransition', () => { - return jest.fn(); + return { + useDelayedTransition: jest.fn() + }; }); const mockAddToast = jest.fn(); diff --git a/packages/venia-ui/lib/components/App/app.js b/packages/venia-ui/lib/components/App/app.js index e77f0b37bb..5ca6843d68 100644 --- a/packages/venia-ui/lib/components/App/app.js +++ b/packages/venia-ui/lib/components/App/app.js @@ -3,7 +3,7 @@ import { useIntl } from 'react-intl'; import { array, func, shape, string } from 'prop-types'; import { useToasts } from '@magento/peregrine'; -import useDelayedTransition from '@magento/peregrine/lib/hooks/useDelayedTransition'; +import { useDelayedTransition } from '@magento/peregrine/lib/hooks/useDelayedTransition'; import { useApp } from '@magento/peregrine/lib/talons/App/useApp'; import globalCSS from '../../index.module.css'; diff --git a/packages/venia-ui/lib/components/Link/__tests__/link.spec.js b/packages/venia-ui/lib/components/Link/__tests__/link.spec.js index 857b728dd0..223ee72419 100644 --- a/packages/venia-ui/lib/components/Link/__tests__/link.spec.js +++ b/packages/venia-ui/lib/components/Link/__tests__/link.spec.js @@ -1,15 +1,17 @@ import React from 'react'; import { act, create } from 'react-test-renderer'; import { Link as RouterLink } from 'react-router-dom'; -import useLink from '@magento/peregrine/lib/talons/Link/useLink'; +import { useLink } from '@magento/peregrine/lib/talons/Link/useLink'; import Link from '../link'; jest.mock('@magento/peregrine/lib/talons/Link/useLink', () => { - return jest.fn(({ innerRef }) => { - return { - ref: innerRef - }; - }); + return { + useLink: jest.fn(({ innerRef }) => { + return { + ref: innerRef + }; + }) + }; }); jest.mock('react-router-dom', () => { diff --git a/packages/venia-ui/lib/components/Link/link.js b/packages/venia-ui/lib/components/Link/link.js index d256252d9f..6a846e6fea 100644 --- a/packages/venia-ui/lib/components/Link/link.js +++ b/packages/venia-ui/lib/components/Link/link.js @@ -1,7 +1,7 @@ import React from 'react'; import { Link as RouterLink } from 'react-router-dom'; import { bool } from 'prop-types'; -import useLink from '@magento/peregrine/lib/talons/Link/useLink'; +import { useLink } from '@magento/peregrine/lib/talons/Link/useLink'; /** * @kind functional component diff --git a/packages/venia-ui/lib/components/PageLoadingIndicator/__tests__/pageLoadingIndicator.spec.js b/packages/venia-ui/lib/components/PageLoadingIndicator/__tests__/pageLoadingIndicator.spec.js index edbc1ce6f9..d179f593a5 100644 --- a/packages/venia-ui/lib/components/PageLoadingIndicator/__tests__/pageLoadingIndicator.spec.js +++ b/packages/venia-ui/lib/components/PageLoadingIndicator/__tests__/pageLoadingIndicator.spec.js @@ -1,6 +1,6 @@ import React from 'react'; import { act, create } from 'react-test-renderer'; -import usePageLoadingIndicator from '@magento/peregrine/lib/talons/PageLoadingIndicator/usePageLoadingIndicator'; +import { usePageLoadingIndicator } from '@magento/peregrine/lib/talons/PageLoadingIndicator/usePageLoadingIndicator'; import PageLoadingIndicator from '../pageLoadingIndicator'; jest.mock( diff --git a/packages/venia-ui/lib/components/PageLoadingIndicator/pageLoadingIndicator.js b/packages/venia-ui/lib/components/PageLoadingIndicator/pageLoadingIndicator.js index 615db1d310..96954fc8e9 100644 --- a/packages/venia-ui/lib/components/PageLoadingIndicator/pageLoadingIndicator.js +++ b/packages/venia-ui/lib/components/PageLoadingIndicator/pageLoadingIndicator.js @@ -2,7 +2,7 @@ import React from 'react'; import { shape, string, bool } from 'prop-types'; import { useStyle } from '../../classify'; import defaultClasses from './pageLoadingIndicator.module.css'; -import usePageLoadingIndicator from '@magento/peregrine/lib/talons/PageLoadingIndicator/usePageLoadingIndicator'; +import { usePageLoadingIndicator } from '@magento/peregrine/lib/talons/PageLoadingIndicator/usePageLoadingIndicator'; const PageLoadingIndicator = props => { const classes = useStyle(defaultClasses, props.classes); From 944be8c68de04110d393c83ec3bf1fa7d239c57d Mon Sep 17 00:00:00 2001 From: devops-pwa-codebuild Date: Wed, 2 Nov 2022 21:53:59 +0000 Subject: [PATCH 07/17] v12.7.0-beta.2 --- package.json | 2 +- packages/babel-preset-peregrine/package.json | 2 +- packages/create-pwa/package.json | 6 +++--- .../experience-platform-connector/package.json | 6 +++--- .../upward-security-headers/package.json | 6 +++--- .../venia-sample-backends/package.json | 4 ++-- .../venia-sample-eventing/package.json | 6 +++--- .../venia-sample-language-packs/package.json | 6 +++--- .../venia-sample-payments-checkmo/package.json | 8 ++++---- packages/pagebuilder/package.json | 16 ++++++++-------- packages/peregrine/package.json | 2 +- packages/pwa-buildpack/package.json | 2 +- packages/pwa-theme-venia/package.json | 2 +- packages/venia-concept/package.json | 16 ++++++++-------- packages/venia-ui/package.json | 8 ++++---- pwa-devdocs/package.json | 2 +- 16 files changed, 47 insertions(+), 47 deletions(-) diff --git a/package.json b/package.json index de049f7f6d..125bd6ca31 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pwa-studio", - "version": "12.7.0-beta.1", + "version": "12.7.0-beta.2", "private": true, "workspaces": [ "packages/babel-preset-peregrine", diff --git a/packages/babel-preset-peregrine/package.json b/packages/babel-preset-peregrine/package.json index 2a5365d21b..1d6cc190de 100644 --- a/packages/babel-preset-peregrine/package.json +++ b/packages/babel-preset-peregrine/package.json @@ -1,6 +1,6 @@ { "name": "@magento/babel-preset-peregrine", - "version": "1.2.2-beta.1", + "version": "1.2.2-beta.2", "publishConfig": { "access": "public" }, diff --git a/packages/create-pwa/package.json b/packages/create-pwa/package.json index 7eacaa778c..db36500b7c 100644 --- a/packages/create-pwa/package.json +++ b/packages/create-pwa/package.json @@ -1,6 +1,6 @@ { "name": "@magento/create-pwa", - "version": "2.3.3-beta.1", + "version": "2.3.3-beta.2", "publishConfig": { "access": "public" }, @@ -29,8 +29,8 @@ }, "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/create-pwa#readme", "dependencies": { - "@magento/pwa-buildpack": "11.4.1-beta.1", - "@magento/venia-concept": "12.7.0-beta.1", + "@magento/pwa-buildpack": "11.4.1-beta.2", + "@magento/venia-concept": "12.7.0-beta.2", "chalk": "^2.4.2", "change-case": "^3.1.0", "compression": "~1.7.4", diff --git a/packages/extensions/experience-platform-connector/package.json b/packages/extensions/experience-platform-connector/package.json index 1614729bed..b39a7df911 100644 --- a/packages/extensions/experience-platform-connector/package.json +++ b/packages/extensions/experience-platform-connector/package.json @@ -1,6 +1,6 @@ { "name": "@magento/experience-platform-connector", - "version": "1.0.2-beta.1", + "version": "1.0.2-beta.2", "publishConfig": { "access": "public" }, @@ -18,8 +18,8 @@ "devDependencies": {}, "peerDependencies": { "@apollo/client": "~3.5.0", - "@magento/peregrine": "12.6.0-beta.1", - "@magento/pwa-buildpack": "11.4.1-beta.1", + "@magento/peregrine": "12.6.0-beta.2", + "@magento/pwa-buildpack": "11.4.1-beta.2", "react": "~17.0.1" }, "pwa-studio": { diff --git a/packages/extensions/upward-security-headers/package.json b/packages/extensions/upward-security-headers/package.json index d6d12536ae..b7788b501a 100644 --- a/packages/extensions/upward-security-headers/package.json +++ b/packages/extensions/upward-security-headers/package.json @@ -1,6 +1,6 @@ { "name": "@magento/upward-security-headers", - "version": "1.0.11-beta.1", + "version": "1.0.11-beta.2", "publishConfig": { "access": "public" }, @@ -13,8 +13,8 @@ "author": "Adobe Commerce", "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { - "@magento/pwa-buildpack": "11.4.1-beta.1", - "@magento/venia-ui": "9.7.0-beta.1", + "@magento/pwa-buildpack": "11.4.1-beta.2", + "@magento/venia-ui": "9.7.0-beta.2", "webpack": "~4.46.0" }, "pwa-studio": { diff --git a/packages/extensions/venia-sample-backends/package.json b/packages/extensions/venia-sample-backends/package.json index 192184e15c..81ff3ba0e3 100644 --- a/packages/extensions/venia-sample-backends/package.json +++ b/packages/extensions/venia-sample-backends/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-backends", - "version": "0.0.9-beta.1", + "version": "0.0.9-beta.2", "publishConfig": { "access": "public" }, @@ -13,7 +13,7 @@ "repository": "github:magento/pwa-studio", "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { - "@magento/pwa-buildpack": "11.4.1-beta.1", + "@magento/pwa-buildpack": "11.4.1-beta.2", "node-fetch": "~2.3.0" }, "pwa-studio": { diff --git a/packages/extensions/venia-sample-eventing/package.json b/packages/extensions/venia-sample-eventing/package.json index 6408f1c344..fc8858ab95 100644 --- a/packages/extensions/venia-sample-eventing/package.json +++ b/packages/extensions/venia-sample-eventing/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-eventing", - "version": "0.0.3-beta.1", + "version": "0.0.3-beta.2", "publishConfig": { "access": "public" }, @@ -12,8 +12,8 @@ "repository": "github:magento/pwa-studio", "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { - "@magento/peregrine": "12.6.0-beta.1", - "@magento/pwa-buildpack": "11.4.1-beta.1", + "@magento/peregrine": "12.6.0-beta.2", + "@magento/pwa-buildpack": "11.4.1-beta.2", "react": "~17.0.1" }, "pwa-studio": { diff --git a/packages/extensions/venia-sample-language-packs/package.json b/packages/extensions/venia-sample-language-packs/package.json index 2f8209808e..c32d084e19 100644 --- a/packages/extensions/venia-sample-language-packs/package.json +++ b/packages/extensions/venia-sample-language-packs/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-language-packs", - "version": "0.0.11-beta.1", + "version": "0.0.11-beta.2", "publishConfig": { "access": "public" }, @@ -12,8 +12,8 @@ "repository": "github:magento/pwa-studio", "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { - "@magento/pwa-buildpack": "11.4.1-beta.1", - "@magento/venia-ui": "9.7.0-beta.1" + "@magento/pwa-buildpack": "11.4.1-beta.2", + "@magento/venia-ui": "9.7.0-beta.2" }, "pwa-studio": { "targets": { diff --git a/packages/extensions/venia-sample-payments-checkmo/package.json b/packages/extensions/venia-sample-payments-checkmo/package.json index e93db39326..4f1bfb1252 100644 --- a/packages/extensions/venia-sample-payments-checkmo/package.json +++ b/packages/extensions/venia-sample-payments-checkmo/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-payments-checkmo", - "version": "0.0.9-beta.1", + "version": "0.0.9-beta.2", "publishConfig": { "access": "public" }, @@ -12,9 +12,9 @@ "repository": "github:magento/pwa-studio", "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { - "@magento/peregrine": "12.6.0-beta.1", - "@magento/pwa-buildpack": "11.4.1-beta.1", - "@magento/venia-ui": "9.7.0-beta.1", + "@magento/peregrine": "12.6.0-beta.2", + "@magento/pwa-buildpack": "11.4.1-beta.2", + "@magento/venia-ui": "9.7.0-beta.2", "react": "~17.0.1", "react-intl": "~5.20.0", "react-router-dom": "~5.2.0" diff --git a/packages/pagebuilder/package.json b/packages/pagebuilder/package.json index 66ecfa1898..2c0afd9378 100644 --- a/packages/pagebuilder/package.json +++ b/packages/pagebuilder/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pagebuilder", - "version": "7.4.2-beta.1", + "version": "7.4.2-beta.2", "publishConfig": { "access": "public" }, @@ -34,9 +34,9 @@ "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/pagebuilder#readme", "dependencies": {}, "devDependencies": { - "@magento/peregrine": "12.6.0-beta.1", - "@magento/pwa-buildpack": "11.4.1-beta.1", - "@magento/venia-ui": "9.7.0-beta.1", + "@magento/peregrine": "12.6.0-beta.2", + "@magento/pwa-buildpack": "11.4.1-beta.2", + "@magento/venia-ui": "9.7.0-beta.2", "@storybook/react": "~6.3.7", "jarallax": "~1.11.1", "load-google-maps-api": "~2.0.1", @@ -49,10 +49,10 @@ }, "peerDependencies": { "@apollo/client": "~3.5.0", - "@magento/babel-preset-peregrine": "1.2.2-beta.1", - "@magento/peregrine": "12.6.0-beta.1", - "@magento/pwa-buildpack": "11.4.1-beta.1", - "@magento/venia-ui": "9.7.0-beta.1", + "@magento/babel-preset-peregrine": "1.2.2-beta.2", + "@magento/peregrine": "12.6.0-beta.2", + "@magento/pwa-buildpack": "11.4.1-beta.2", + "@magento/venia-ui": "9.7.0-beta.2", "jarallax": "~1.11.1", "load-google-maps-api": "~2.0.1", "lodash.escape": "~4.0.1", diff --git a/packages/peregrine/package.json b/packages/peregrine/package.json index 9f605a5047..b9adbc7469 100644 --- a/packages/peregrine/package.json +++ b/packages/peregrine/package.json @@ -1,6 +1,6 @@ { "name": "@magento/peregrine", - "version": "12.6.0-beta.1", + "version": "12.6.0-beta.2", "publishConfig": { "access": "public" }, diff --git a/packages/pwa-buildpack/package.json b/packages/pwa-buildpack/package.json index 23d77db303..1a3e600f47 100644 --- a/packages/pwa-buildpack/package.json +++ b/packages/pwa-buildpack/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pwa-buildpack", - "version": "11.4.1-beta.1", + "version": "11.4.1-beta.2", "publishConfig": { "access": "public" }, diff --git a/packages/pwa-theme-venia/package.json b/packages/pwa-theme-venia/package.json index 5df89e6e40..6c5c839b5c 100644 --- a/packages/pwa-theme-venia/package.json +++ b/packages/pwa-theme-venia/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pwa-theme-venia", - "version": "1.4.0-beta.1", + "version": "1.4.0-beta.2", "publishConfig": { "access": "public" }, diff --git a/packages/venia-concept/package.json b/packages/venia-concept/package.json index 80eddc88c4..93374bde97 100644 --- a/packages/venia-concept/package.json +++ b/packages/venia-concept/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-concept", - "version": "12.7.0-beta.1", + "version": "12.7.0-beta.2", "publishConfig": { "access": "public" }, @@ -35,7 +35,7 @@ }, "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/venia-concept#readme", "dependencies": { - "@magento/pwa-buildpack": "11.4.1-beta.1" + "@magento/pwa-buildpack": "11.4.1-beta.2" }, "devDependencies": { "@adobe/apollo-link-mutation-queue": "~1.0.2", @@ -50,13 +50,13 @@ "@babel/plugin-transform-runtime": "~7.4.4", "@babel/preset-env": "~7.16.0", "@babel/runtime": "~7.15.3", - "@magento/babel-preset-peregrine": "1.2.2-beta.1", + "@magento/babel-preset-peregrine": "1.2.2-beta.2", "@magento/eslint-config": "~1.5.0", - "@magento/pagebuilder": "7.4.2-beta.1", - "@magento/peregrine": "12.6.0-beta.1", - "@magento/pwa-theme-venia": "1.4.0-beta.1", - "@magento/upward-security-headers": "1.0.11-beta.1", - "@magento/venia-ui": "9.7.0-beta.1", + "@magento/pagebuilder": "7.4.2-beta.2", + "@magento/peregrine": "12.6.0-beta.2", + "@magento/pwa-theme-venia": "1.4.0-beta.2", + "@magento/upward-security-headers": "1.0.11-beta.2", + "@magento/venia-ui": "9.7.0-beta.2", "@pmmmwh/react-refresh-webpack-plugin": "0.4.1", "@storybook/react": "~6.3.7", "@types/node": "16", diff --git a/packages/venia-ui/package.json b/packages/venia-ui/package.json index 5a4ded28ac..f1c2fae375 100644 --- a/packages/venia-ui/package.json +++ b/packages/venia-ui/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-ui", - "version": "9.7.0-beta.1", + "version": "9.7.0-beta.2", "publishConfig": { "access": "public" }, @@ -79,9 +79,9 @@ }, "peerDependencies": { "@apollo/client": "~3.5.0", - "@magento/babel-preset-peregrine": "1.2.2-beta.1", - "@magento/peregrine": "12.6.0-beta.1", - "@magento/pwa-buildpack": "11.4.1-beta.1", + "@magento/babel-preset-peregrine": "1.2.2-beta.2", + "@magento/peregrine": "12.6.0-beta.2", + "@magento/pwa-buildpack": "11.4.1-beta.2", "apollo-cache-persist": "~0.1.1", "braintree-web-drop-in": "~1.33.3", "graphql": "~15.5.0", diff --git a/pwa-devdocs/package.json b/pwa-devdocs/package.json index b4ac1d61a0..85ecfe73ca 100644 --- a/pwa-devdocs/package.json +++ b/pwa-devdocs/package.json @@ -1,7 +1,7 @@ { "name": "pwa-devdocs", "private": true, - "version": "12.7.0-beta.1", + "version": "12.7.0-beta.2", "description": "A documentation site for Magento PWA", "main": "gulpfile.js", "dependencies": { From 6cd1f39550891be1854aba1ce3a7de79d3558fd7 Mon Sep 17 00:00:00 2001 From: devops-pwa-codebuild Date: Wed, 2 Nov 2022 22:06:40 +0000 Subject: [PATCH 08/17] v12.7.0 --- package.json | 2 +- packages/babel-preset-peregrine/package.json | 2 +- packages/create-pwa/package.json | 6 +++--- .../experience-platform-connector/package.json | 6 +++--- .../upward-security-headers/package.json | 6 +++--- .../venia-sample-backends/package.json | 4 ++-- .../venia-sample-eventing/package.json | 6 +++--- .../venia-sample-language-packs/package.json | 6 +++--- .../venia-sample-payments-checkmo/package.json | 8 ++++---- packages/pagebuilder/package.json | 16 ++++++++-------- packages/peregrine/package.json | 2 +- packages/pwa-buildpack/package.json | 2 +- packages/pwa-theme-venia/package.json | 2 +- packages/venia-concept/package.json | 16 ++++++++-------- packages/venia-ui/package.json | 8 ++++---- pwa-devdocs/package.json | 2 +- 16 files changed, 47 insertions(+), 47 deletions(-) diff --git a/package.json b/package.json index 125bd6ca31..49b1240f21 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pwa-studio", - "version": "12.7.0-beta.2", + "version": "12.7.0", "private": true, "workspaces": [ "packages/babel-preset-peregrine", diff --git a/packages/babel-preset-peregrine/package.json b/packages/babel-preset-peregrine/package.json index 1d6cc190de..350961983b 100644 --- a/packages/babel-preset-peregrine/package.json +++ b/packages/babel-preset-peregrine/package.json @@ -1,6 +1,6 @@ { "name": "@magento/babel-preset-peregrine", - "version": "1.2.2-beta.2", + "version": "1.2.2", "publishConfig": { "access": "public" }, diff --git a/packages/create-pwa/package.json b/packages/create-pwa/package.json index db36500b7c..28293c08d1 100644 --- a/packages/create-pwa/package.json +++ b/packages/create-pwa/package.json @@ -1,6 +1,6 @@ { "name": "@magento/create-pwa", - "version": "2.3.3-beta.2", + "version": "2.3.3", "publishConfig": { "access": "public" }, @@ -29,8 +29,8 @@ }, "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/create-pwa#readme", "dependencies": { - "@magento/pwa-buildpack": "11.4.1-beta.2", - "@magento/venia-concept": "12.7.0-beta.2", + "@magento/pwa-buildpack": "~11.4.1", + "@magento/venia-concept": "~12.7.0", "chalk": "^2.4.2", "change-case": "^3.1.0", "compression": "~1.7.4", diff --git a/packages/extensions/experience-platform-connector/package.json b/packages/extensions/experience-platform-connector/package.json index b39a7df911..4b612e4dd2 100644 --- a/packages/extensions/experience-platform-connector/package.json +++ b/packages/extensions/experience-platform-connector/package.json @@ -1,6 +1,6 @@ { "name": "@magento/experience-platform-connector", - "version": "1.0.2-beta.2", + "version": "1.0.2", "publishConfig": { "access": "public" }, @@ -18,8 +18,8 @@ "devDependencies": {}, "peerDependencies": { "@apollo/client": "~3.5.0", - "@magento/peregrine": "12.6.0-beta.2", - "@magento/pwa-buildpack": "11.4.1-beta.2", + "@magento/peregrine": "~12.6.0", + "@magento/pwa-buildpack": "~11.4.1", "react": "~17.0.1" }, "pwa-studio": { diff --git a/packages/extensions/upward-security-headers/package.json b/packages/extensions/upward-security-headers/package.json index b7788b501a..e972d6ab6b 100644 --- a/packages/extensions/upward-security-headers/package.json +++ b/packages/extensions/upward-security-headers/package.json @@ -1,6 +1,6 @@ { "name": "@magento/upward-security-headers", - "version": "1.0.11-beta.2", + "version": "1.0.11", "publishConfig": { "access": "public" }, @@ -13,8 +13,8 @@ "author": "Adobe Commerce", "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { - "@magento/pwa-buildpack": "11.4.1-beta.2", - "@magento/venia-ui": "9.7.0-beta.2", + "@magento/pwa-buildpack": "~11.4.1", + "@magento/venia-ui": "~9.7.0", "webpack": "~4.46.0" }, "pwa-studio": { diff --git a/packages/extensions/venia-sample-backends/package.json b/packages/extensions/venia-sample-backends/package.json index 81ff3ba0e3..4b9e0440db 100644 --- a/packages/extensions/venia-sample-backends/package.json +++ b/packages/extensions/venia-sample-backends/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-backends", - "version": "0.0.9-beta.2", + "version": "0.0.9", "publishConfig": { "access": "public" }, @@ -13,7 +13,7 @@ "repository": "github:magento/pwa-studio", "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { - "@magento/pwa-buildpack": "11.4.1-beta.2", + "@magento/pwa-buildpack": "~11.4.1", "node-fetch": "~2.3.0" }, "pwa-studio": { diff --git a/packages/extensions/venia-sample-eventing/package.json b/packages/extensions/venia-sample-eventing/package.json index fc8858ab95..0056623dd9 100644 --- a/packages/extensions/venia-sample-eventing/package.json +++ b/packages/extensions/venia-sample-eventing/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-eventing", - "version": "0.0.3-beta.2", + "version": "0.0.3", "publishConfig": { "access": "public" }, @@ -12,8 +12,8 @@ "repository": "github:magento/pwa-studio", "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { - "@magento/peregrine": "12.6.0-beta.2", - "@magento/pwa-buildpack": "11.4.1-beta.2", + "@magento/peregrine": "~12.6.0", + "@magento/pwa-buildpack": "~11.4.1", "react": "~17.0.1" }, "pwa-studio": { diff --git a/packages/extensions/venia-sample-language-packs/package.json b/packages/extensions/venia-sample-language-packs/package.json index c32d084e19..b8d356dd26 100644 --- a/packages/extensions/venia-sample-language-packs/package.json +++ b/packages/extensions/venia-sample-language-packs/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-language-packs", - "version": "0.0.11-beta.2", + "version": "0.0.11", "publishConfig": { "access": "public" }, @@ -12,8 +12,8 @@ "repository": "github:magento/pwa-studio", "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { - "@magento/pwa-buildpack": "11.4.1-beta.2", - "@magento/venia-ui": "9.7.0-beta.2" + "@magento/pwa-buildpack": "~11.4.1", + "@magento/venia-ui": "~9.7.0" }, "pwa-studio": { "targets": { diff --git a/packages/extensions/venia-sample-payments-checkmo/package.json b/packages/extensions/venia-sample-payments-checkmo/package.json index 4f1bfb1252..a507e779bf 100644 --- a/packages/extensions/venia-sample-payments-checkmo/package.json +++ b/packages/extensions/venia-sample-payments-checkmo/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-payments-checkmo", - "version": "0.0.9-beta.2", + "version": "0.0.9", "publishConfig": { "access": "public" }, @@ -12,9 +12,9 @@ "repository": "github:magento/pwa-studio", "license": "(OSL-3.0 OR AFL-3.0)", "peerDependencies": { - "@magento/peregrine": "12.6.0-beta.2", - "@magento/pwa-buildpack": "11.4.1-beta.2", - "@magento/venia-ui": "9.7.0-beta.2", + "@magento/peregrine": "~12.6.0", + "@magento/pwa-buildpack": "~11.4.1", + "@magento/venia-ui": "~9.7.0", "react": "~17.0.1", "react-intl": "~5.20.0", "react-router-dom": "~5.2.0" diff --git a/packages/pagebuilder/package.json b/packages/pagebuilder/package.json index 2c0afd9378..a7b5b1ca4d 100644 --- a/packages/pagebuilder/package.json +++ b/packages/pagebuilder/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pagebuilder", - "version": "7.4.2-beta.2", + "version": "7.4.2", "publishConfig": { "access": "public" }, @@ -34,9 +34,9 @@ "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/pagebuilder#readme", "dependencies": {}, "devDependencies": { - "@magento/peregrine": "12.6.0-beta.2", - "@magento/pwa-buildpack": "11.4.1-beta.2", - "@magento/venia-ui": "9.7.0-beta.2", + "@magento/peregrine": "~12.6.0", + "@magento/pwa-buildpack": "~11.4.1", + "@magento/venia-ui": "~9.7.0", "@storybook/react": "~6.3.7", "jarallax": "~1.11.1", "load-google-maps-api": "~2.0.1", @@ -49,10 +49,10 @@ }, "peerDependencies": { "@apollo/client": "~3.5.0", - "@magento/babel-preset-peregrine": "1.2.2-beta.2", - "@magento/peregrine": "12.6.0-beta.2", - "@magento/pwa-buildpack": "11.4.1-beta.2", - "@magento/venia-ui": "9.7.0-beta.2", + "@magento/babel-preset-peregrine": "~1.2.2", + "@magento/peregrine": "~12.6.0", + "@magento/pwa-buildpack": "~11.4.1", + "@magento/venia-ui": "~9.7.0", "jarallax": "~1.11.1", "load-google-maps-api": "~2.0.1", "lodash.escape": "~4.0.1", diff --git a/packages/peregrine/package.json b/packages/peregrine/package.json index b9adbc7469..ba1de33804 100644 --- a/packages/peregrine/package.json +++ b/packages/peregrine/package.json @@ -1,6 +1,6 @@ { "name": "@magento/peregrine", - "version": "12.6.0-beta.2", + "version": "12.6.0", "publishConfig": { "access": "public" }, diff --git a/packages/pwa-buildpack/package.json b/packages/pwa-buildpack/package.json index 1a3e600f47..72be603aa0 100644 --- a/packages/pwa-buildpack/package.json +++ b/packages/pwa-buildpack/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pwa-buildpack", - "version": "11.4.1-beta.2", + "version": "11.4.1", "publishConfig": { "access": "public" }, diff --git a/packages/pwa-theme-venia/package.json b/packages/pwa-theme-venia/package.json index 6c5c839b5c..11b83d7737 100644 --- a/packages/pwa-theme-venia/package.json +++ b/packages/pwa-theme-venia/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pwa-theme-venia", - "version": "1.4.0-beta.2", + "version": "1.4.0", "publishConfig": { "access": "public" }, diff --git a/packages/venia-concept/package.json b/packages/venia-concept/package.json index 93374bde97..20f7076d17 100644 --- a/packages/venia-concept/package.json +++ b/packages/venia-concept/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-concept", - "version": "12.7.0-beta.2", + "version": "12.7.0", "publishConfig": { "access": "public" }, @@ -35,7 +35,7 @@ }, "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/venia-concept#readme", "dependencies": { - "@magento/pwa-buildpack": "11.4.1-beta.2" + "@magento/pwa-buildpack": "~11.4.1" }, "devDependencies": { "@adobe/apollo-link-mutation-queue": "~1.0.2", @@ -50,13 +50,13 @@ "@babel/plugin-transform-runtime": "~7.4.4", "@babel/preset-env": "~7.16.0", "@babel/runtime": "~7.15.3", - "@magento/babel-preset-peregrine": "1.2.2-beta.2", + "@magento/babel-preset-peregrine": "~1.2.2", "@magento/eslint-config": "~1.5.0", - "@magento/pagebuilder": "7.4.2-beta.2", - "@magento/peregrine": "12.6.0-beta.2", - "@magento/pwa-theme-venia": "1.4.0-beta.2", - "@magento/upward-security-headers": "1.0.11-beta.2", - "@magento/venia-ui": "9.7.0-beta.2", + "@magento/pagebuilder": "~7.4.2", + "@magento/peregrine": "~12.6.0", + "@magento/pwa-theme-venia": "~1.4.0", + "@magento/upward-security-headers": "~1.0.11", + "@magento/venia-ui": "~9.7.0", "@pmmmwh/react-refresh-webpack-plugin": "0.4.1", "@storybook/react": "~6.3.7", "@types/node": "16", diff --git a/packages/venia-ui/package.json b/packages/venia-ui/package.json index f1c2fae375..9ee212ca95 100644 --- a/packages/venia-ui/package.json +++ b/packages/venia-ui/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-ui", - "version": "9.7.0-beta.2", + "version": "9.7.0", "publishConfig": { "access": "public" }, @@ -79,9 +79,9 @@ }, "peerDependencies": { "@apollo/client": "~3.5.0", - "@magento/babel-preset-peregrine": "1.2.2-beta.2", - "@magento/peregrine": "12.6.0-beta.2", - "@magento/pwa-buildpack": "11.4.1-beta.2", + "@magento/babel-preset-peregrine": "~1.2.2", + "@magento/peregrine": "~12.6.0", + "@magento/pwa-buildpack": "~11.4.1", "apollo-cache-persist": "~0.1.1", "braintree-web-drop-in": "~1.33.3", "graphql": "~15.5.0", diff --git a/pwa-devdocs/package.json b/pwa-devdocs/package.json index 85ecfe73ca..3c44e96a16 100644 --- a/pwa-devdocs/package.json +++ b/pwa-devdocs/package.json @@ -1,7 +1,7 @@ { "name": "pwa-devdocs", "private": true, - "version": "12.7.0-beta.2", + "version": "12.7.0", "description": "A documentation site for Magento PWA", "main": "gulpfile.js", "dependencies": { From b7794106d5ae60272673151f08eaf1064ac19d37 Mon Sep 17 00:00:00 2001 From: Deepak Upadhyay <32363872+dupadhyay3@users.noreply.github.com> Date: Wed, 9 Nov 2022 03:06:06 +0530 Subject: [PATCH 09/17] cahnges attribute from depricated id to uid (#3982) Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> --- .../RootComponents/Category/NoProductsFound/noProductsFound.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/venia-ui/lib/RootComponents/Category/NoProductsFound/noProductsFound.js b/packages/venia-ui/lib/RootComponents/Category/NoProductsFound/noProductsFound.js index df02ae5e7b..d9277196eb 100644 --- a/packages/venia-ui/lib/RootComponents/Category/NoProductsFound/noProductsFound.js +++ b/packages/venia-ui/lib/RootComponents/Category/NoProductsFound/noProductsFound.js @@ -28,7 +28,7 @@ const NoProductsFound = props => { ); return ( -
  • +
  • {category.name}
    • ); From 818452568d6f0394cd009ea8162774d4e8ffa874 Mon Sep 17 00:00:00 2001 From: Aanchal Pawar <97873570+glo82145@users.noreply.github.com> Date: Wed, 9 Nov 2022 05:49:28 +0530 Subject: [PATCH 10/17] AC-2489::Page title for search page not informative (Search Results) (#3931) * AC-2489::Page title for search page not informative (Search Results) * AC-2489::Fixed the lint issue on searchPage.js * AC-2489::fixed failing pr-test testcase * AC-2489::Added store view name with search term * AC-2489::Added storename with search term aria-label * AC-2489::fixed yarn test cases Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> --- .../__snapshots__/useSearchPage.spec.js.snap | 1 + .../__tests__/useSearchPage.spec.js | 45 ++++++++++++++- .../lib/talons/SearchPage/useSearchPage.js | 7 ++- .../__snapshots__/searchPage.spec.js.snap | 56 +++++++++---------- .../lib/components/SearchPage/searchPage.js | 10 ++-- 5 files changed, 81 insertions(+), 38 deletions(-) diff --git a/packages/peregrine/lib/talons/SearchPage/__tests__/__snapshots__/useSearchPage.spec.js.snap b/packages/peregrine/lib/talons/SearchPage/__tests__/__snapshots__/useSearchPage.spec.js.snap index 5070948f12..46e5500b7d 100644 --- a/packages/peregrine/lib/talons/SearchPage/__tests__/__snapshots__/useSearchPage.spec.js.snap +++ b/packages/peregrine/lib/talons/SearchPage/__tests__/__snapshots__/useSearchPage.spec.js.snap @@ -8,6 +8,7 @@ Object { "value": "position", }, ], + "currentStoreName": "Store 1", "data": Object { "products": Object { "page_info": Object { diff --git a/packages/peregrine/lib/talons/SearchPage/__tests__/useSearchPage.spec.js b/packages/peregrine/lib/talons/SearchPage/__tests__/useSearchPage.spec.js index 64bad31332..e31b0adeed 100644 --- a/packages/peregrine/lib/talons/SearchPage/__tests__/useSearchPage.spec.js +++ b/packages/peregrine/lib/talons/SearchPage/__tests__/useSearchPage.spec.js @@ -6,6 +6,7 @@ import { getFiltersFromSearch } from '../../FilterModal/helpers'; import { useSearchPage } from '../useSearchPage'; import { getSearchParam } from '../../../hooks/useSearchParam'; import { useEventingContext } from '../../../context/eventing'; +import { useStoreSwitcher } from '@magento/peregrine/lib/talons/Header/useStoreSwitcher'; const log = jest.fn(); const Component = props => { @@ -28,6 +29,10 @@ const mockUseSort = jest .mockName('mockUseSort'); const mockSetCurrentPage = jest.fn().mockName('mockSetCurrentPage'); +jest.mock('@magento/peregrine/lib/talons/Header/useStoreSwitcher', () => ({ + useStoreSwitcher: jest.fn() +})); + jest.mock('react-router-dom', () => ({ useHistory: jest.fn(() => ({ push: jest.fn() })), useLocation: jest.fn(() => ({ @@ -135,6 +140,9 @@ const mockGetSearchAvailableSortMethods = jest.fn(); describe('searchCategory', () => { test('returns the correct shape', () => { + useStoreSwitcher.mockReturnValueOnce({ + currentStoreName: 'Store 1' + }); useLazyQuery.mockReturnValueOnce([ mockGetSearchAvailableSortMethods, { data: mockAvailableSortMethods } @@ -149,6 +157,9 @@ describe('searchCategory', () => { mockGetSearchAvailableSortMethods, { data: mockAvailableSortMethods } ]); + useStoreSwitcher.mockReturnValueOnce({ + currentStoreName: 'Store 1' + }); getFiltersFromSearch.mockReturnValueOnce(new Map()); // Act. createTestInstance(); @@ -162,6 +173,9 @@ describe('searchCategory', () => { mockGetSearchAvailableSortMethods, { data: mockAvailableSortMethods } ]); + useStoreSwitcher.mockReturnValueOnce({ + currentStoreName: 'Store 1' + }); const map = new Map().set('not_category_id', 'unit test'); getFiltersFromSearch.mockReturnValueOnce(map); // Act. @@ -176,6 +190,9 @@ describe('searchCategory', () => { mockGetSearchAvailableSortMethods, { data: mockAvailableSortMethods } ]); + useStoreSwitcher.mockReturnValueOnce({ + currentStoreName: 'Store 1' + }); const map = new Map().set('category_id', new Set(['Bottoms,11'])); getFiltersFromSearch.mockReturnValueOnce(map); // Act. @@ -190,6 +207,9 @@ describe('searchCategory', () => { mockGetSearchAvailableSortMethods, { data: mockAvailableSortMethods } ]); + useStoreSwitcher.mockReturnValueOnce({ + currentStoreName: 'Store 1' + }); const map = new Map().set( 'category_id', new Set(['Bottoms,11', 'Skirts,12']) @@ -207,7 +227,8 @@ describe('searchCategory', () => { { sortText: 'Changed', sortAttribute: 'relevance', - sortDirection: 'DESC' + sortDirection: 'DESC', + currentStoreName: 'Store 1' }, 0 ], @@ -216,7 +237,8 @@ describe('searchCategory', () => { { sortText: 'Best Match', sortAttribute: 'Changed', - sortDirection: 'DESC' + sortDirection: 'DESC', + currentStoreName: 'Store 1' }, 1 ], @@ -225,7 +247,8 @@ describe('searchCategory', () => { { sortText: 'Best Match', sortAttribute: 'relevance', - sortDirection: 'Changed' + sortDirection: 'Changed', + currentStoreName: 'Store 1' }, 1 ] @@ -234,18 +257,25 @@ describe('searchCategory', () => { 'Changing %s current page to 1.', (description, sortParams, expected) => { mockUseSort.mockReturnValueOnce([sortParams, jest.fn()]); + useStoreSwitcher.mockReturnValueOnce({ + currentStoreName: 'Store 1' + }); useLazyQuery.mockReturnValueOnce([ mockGetSearchAvailableSortMethods, { data: mockAvailableSortMethods } ]); const tree = createTestInstance(); act(() => { + useStoreSwitcher.mockReturnValueOnce({ + currentStoreName: 'Store 1' + }); useLazyQuery.mockReturnValueOnce([ mockGetSearchAvailableSortMethods, { data: mockAvailableSortMethods } ]); tree.update(); }); + expect(mockSetCurrentPage).toHaveBeenCalledTimes(expected); } ); @@ -254,6 +284,9 @@ describe('searchCategory', () => { mockGetSearchAvailableSortMethods, { data: mockAvailableSortMethods } ]); + useStoreSwitcher.mockReturnValueOnce({ + currentStoreName: 'Store 1' + }); mockUseSort.mockReturnValueOnce([ { sortText: 'Best Match', @@ -269,6 +302,9 @@ describe('searchCategory', () => { mockGetSearchAvailableSortMethods, { data: mockAvailableSortMethods } ]); + useStoreSwitcher.mockReturnValueOnce({ + currentStoreName: 'Store 1' + }); tree.update(); }); expect(mockSetCurrentPage).toHaveBeenCalledWith(1, true); @@ -283,6 +319,9 @@ describe('searchCategory', () => { mockGetSearchAvailableSortMethods, { data: mockAvailableSortMethods } ]); + useStoreSwitcher.mockReturnValueOnce({ + currentStoreName: 'Store 1' + }); mockUseSort.mockReturnValueOnce([ { sortText: 'Sort Text', diff --git a/packages/peregrine/lib/talons/SearchPage/useSearchPage.js b/packages/peregrine/lib/talons/SearchPage/useSearchPage.js index 2fc583dafa..279fe12377 100644 --- a/packages/peregrine/lib/talons/SearchPage/useSearchPage.js +++ b/packages/peregrine/lib/talons/SearchPage/useSearchPage.js @@ -1,7 +1,7 @@ import { useCallback, useEffect, useMemo, useRef } from 'react'; import { useLazyQuery, useQuery } from '@apollo/client'; import { useLocation } from 'react-router-dom'; - +import { useStoreSwitcher } from '@magento/peregrine/lib/talons/Header/useStoreSwitcher'; import mergeOperations from '../../util/shallowMerge'; import { useAppContext } from '../../context/app'; import { usePagination } from '../../hooks/usePagination'; @@ -22,7 +22,7 @@ import { useEventingContext } from '../../context/eventing'; export const useSearchPage = (props = {}) => { const [, { dispatch }] = useEventingContext(); const operations = mergeOperations(DEFAULT_OPERATIONS, props.operations); - + const { currentStoreName } = useStoreSwitcher(); const { getFilterInputsQuery, getPageSize, @@ -286,6 +286,7 @@ export const useSearchPage = (props = {}) => { pageControl, searchCategory, searchTerm: inputText, - sortProps + sortProps, + currentStoreName }; }; diff --git a/packages/venia-ui/lib/components/SearchPage/__tests__/__snapshots__/searchPage.spec.js.snap b/packages/venia-ui/lib/components/SearchPage/__tests__/__snapshots__/searchPage.spec.js.snap index c0d5844df3..65f9c33b74 100644 --- a/packages/venia-ui/lib/components/SearchPage/__tests__/__snapshots__/searchPage.spec.js.snap +++ b/packages/venia-ui/lib/components/SearchPage/__tests__/__snapshots__/searchPage.spec.js.snap @@ -59,10 +59,10 @@ exports[`Search Page Component error view does not render when data is present 1 - Venia Search + undefined's Search Result for term undefined - Venia Search + undefined's Search Result for term undefined - Venia Search + undefined's Search Result for term undefined - Venia Search + undefined's Search Result for term undefined - Venia Search + undefined's Search Result for term undefined - Venia Search + undefined's Search Result for term undefined - Venia Search + undefined's Search Result for term undefined - Venia Search + undefined's Search Result for term false - Search Term - Venia Search + undefined's Search Result for term Search Term - Venia Search + undefined's Search Result for term undefined - Venia Search + undefined's Search Result for term undefined - Venia Search + undefined's Search Result for term undefined - Venia Search + undefined's Search Result for term undefined - Venia Search + undefined's Search Result for term undefined { pageControl, searchCategory, searchTerm, - sortProps + sortProps, + currentStoreName } = talonProps; const { formatMessage } = useIntl(); + const [currentSort] = sortProps; + const metaTitle = `${currentStoreName}'s Search Result for term ${searchTerm}`; const content = useMemo(() => { if (!data && loading) { return ( @@ -216,8 +218,8 @@ const SearchPage = props => { {content} {maybeFilterModal} - {metaLabel} - + {metaTitle} + ); From b11b984d2b3333d9ecc280f2f656ecabf27fbb83 Mon Sep 17 00:00:00 2001 From: Aanchal Pawar <97873570+glo82145@users.noreply.github.com> Date: Wed, 9 Nov 2022 12:22:23 +0530 Subject: [PATCH 11/17] =?UTF-8?q?AC-6477-There's=20no=20message=20to=20inf?= =?UTF-8?q?orm=20the=20user=20the=20page=20refreshed=20its=20=E2=80=A6=20(?= =?UTF-8?q?#3971)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * AC-6477-There's no message to inform the user the page refreshed its content by clicking/pressing one of the buttons. * AC-6477-There's no message to inform the user the page refreshed its content by clicking/pressing one of the buttons. * AC-6477-There's no message to inform the user the page refreshed its content by clicking/pressing one of the buttons. * AC-6477-There's no message to inform the user the page refreshed its content by clicking/pressing one of the buttons. * AC-6477::There's no message to inform the user the page refreshed its content by clicking/pressing one of the buttons. * AC-6477::Changed the logic as per QA suggestion * AC-6477::added yarn run prettier on packages/venia-ui/lib/components/AccountChip/accountChip.js Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> --- .../__tests__/__snapshots__/accountChip.spec.js.snap | 2 ++ .../venia-ui/lib/components/AccountChip/accountChip.js | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/venia-ui/lib/components/AccountChip/__tests__/__snapshots__/accountChip.spec.js.snap b/packages/venia-ui/lib/components/AccountChip/__tests__/__snapshots__/accountChip.spec.js.snap index a29207987f..cd61f73d0e 100644 --- a/packages/venia-ui/lib/components/AccountChip/__tests__/__snapshots__/accountChip.spec.js.snap +++ b/packages/venia-ui/lib/components/AccountChip/__tests__/__snapshots__/accountChip.spec.js.snap @@ -30,6 +30,8 @@ exports[`it renders a loading indicator when appropriate 1`] = ` { return ( - + {chipText} From acbed17f5de8cd08ac8fec3fec1938c9eb643342 Mon Sep 17 00:00:00 2001 From: Aanchal Pawar <97873570+glo82145@users.noreply.github.com> Date: Thu, 10 Nov 2022 14:36:37 +0530 Subject: [PATCH 12/17] =?UTF-8?q?AC-6675::When=20the=20button=20create=20a?= =?UTF-8?q?n=20account=20is=20pressed=20by=20the=20keyboard=E2=80=A6=20(#3?= =?UTF-8?q?978)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * AC-6675::When the button create an account is pressed by the keyboard, nothing happens * AC-6675::run prettier command useSignIn.js * AC-6675::worked on adding changes for create button keyboard press Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> --- .../__snapshots__/useCreateAccount.spec.js.snap | 2 ++ .../OrderConfirmationPage/useCreateAccount.js | 10 ++++++++++ .../lib/talons/SignIn/__tests__/useSignIn.spec.js | 1 + packages/peregrine/lib/talons/SignIn/useSignIn.js | 9 +++++++++ .../__tests__/__snapshots__/createAccount.spec.js.snap | 2 -- .../lib/components/CreateAccount/createAccount.js | 2 ++ packages/venia-ui/lib/components/SignIn/signIn.js | 2 ++ 7 files changed, 26 insertions(+), 2 deletions(-) diff --git a/packages/peregrine/lib/talons/CheckoutPage/OrderConfirmationPage/__tests__/__snapshots__/useCreateAccount.spec.js.snap b/packages/peregrine/lib/talons/CheckoutPage/OrderConfirmationPage/__tests__/__snapshots__/useCreateAccount.spec.js.snap index 78cfcd0c74..59d4c64a3f 100644 --- a/packages/peregrine/lib/talons/CheckoutPage/OrderConfirmationPage/__tests__/__snapshots__/useCreateAccount.spec.js.snap +++ b/packages/peregrine/lib/talons/CheckoutPage/OrderConfirmationPage/__tests__/__snapshots__/useCreateAccount.spec.js.snap @@ -18,6 +18,7 @@ Object { "createAccountQuery" => undefined, "signInMutation" => undefined, }, + "handleEnterKeyPress": [Function], "handleSubmit": [Function], "initialValues": Object { "customer": Object { @@ -37,6 +38,7 @@ Object { "createAccountQuery" => undefined, "signInMutation" => undefined, }, + "handleEnterKeyPress": [Function], "handleSubmit": [Function], "initialValues": Object { "customer": Object { diff --git a/packages/peregrine/lib/talons/CheckoutPage/OrderConfirmationPage/useCreateAccount.js b/packages/peregrine/lib/talons/CheckoutPage/OrderConfirmationPage/useCreateAccount.js index c96d2de2d4..e1b45e9297 100644 --- a/packages/peregrine/lib/talons/CheckoutPage/OrderConfirmationPage/useCreateAccount.js +++ b/packages/peregrine/lib/talons/CheckoutPage/OrderConfirmationPage/useCreateAccount.js @@ -24,6 +24,7 @@ import { useEventingContext } from '../../../context/eventing'; * @returns {{ * errors: Map, * handleSubmit: function, + * handleEnterKeyPress: function, * isDisabled: boolean, * initialValues: object, * recaptchaWidgetProps: { containerElement: function, shouldRender: boolean } @@ -161,6 +162,14 @@ export const useCreateAccount = props => { ] ); + const handleEnterKeyPress = useCallback(() => { + event => { + if (event.key === 'Enter') { + handleSubmit(); + } + }; + }, [handleSubmit]); + const sanitizedInitialValues = useMemo(() => { const { email, firstName, lastName, ...rest } = initialValues; @@ -182,6 +191,7 @@ export const useCreateAccount = props => { return { errors, handleSubmit, + handleEnterKeyPress, isDisabled: isSubmitting || isGettingDetails || recaptchaLoading, initialValues: sanitizedInitialValues, recaptchaWidgetProps diff --git a/packages/peregrine/lib/talons/SignIn/__tests__/useSignIn.spec.js b/packages/peregrine/lib/talons/SignIn/__tests__/useSignIn.spec.js index a3fca2c93f..f509261608 100644 --- a/packages/peregrine/lib/talons/SignIn/__tests__/useSignIn.spec.js +++ b/packages/peregrine/lib/talons/SignIn/__tests__/useSignIn.spec.js @@ -122,6 +122,7 @@ test('returns correct shape', () => { "signInMutation" => undefined, }, "handleCreateAccount": [Function], + "handleEnterKeyPress": [Function], "handleForgotPassword": [Function], "handleSubmit": [Function], "isBusy": true, diff --git a/packages/peregrine/lib/talons/SignIn/useSignIn.js b/packages/peregrine/lib/talons/SignIn/useSignIn.js index e812ba5bc3..4957083b32 100644 --- a/packages/peregrine/lib/talons/SignIn/useSignIn.js +++ b/packages/peregrine/lib/talons/SignIn/useSignIn.js @@ -165,6 +165,14 @@ export const useSignIn = props => { showCreateAccount(); }, [setDefaultUsername, showCreateAccount]); + const handleEnterKeyPress = useCallback(() => { + event => { + if (event.key === 'Enter') { + handleCreateAccount(); + } + }; + }, [handleCreateAccount]); + const errors = useMemo( () => new Map([ @@ -177,6 +185,7 @@ export const useSignIn = props => { return { errors, handleCreateAccount, + handleEnterKeyPress, handleForgotPassword, handleSubmit, isBusy: isGettingDetails || isSigningIn || recaptchaLoading, diff --git a/packages/venia-ui/lib/components/CreateAccount/__tests__/__snapshots__/createAccount.spec.js.snap b/packages/venia-ui/lib/components/CreateAccount/__tests__/__snapshots__/createAccount.spec.js.snap index 48bf2e0d9b..c4c7b139d4 100644 --- a/packages/venia-ui/lib/components/CreateAccount/__tests__/__snapshots__/createAccount.spec.js.snap +++ b/packages/venia-ui/lib/components/CreateAccount/__tests__/__snapshots__/createAccount.spec.js.snap @@ -215,7 +215,6 @@ exports[`renders the correct tree 1`] = ` disabled={false} onClick={[Function]} onDragStart={[Function]} - onKeyDown={[Function]} onKeyUp={[Function]} onMouseDown={[Function]} onMouseEnter={[Function]} @@ -453,7 +452,6 @@ exports[`should not render cancel button if isCancelButtonHidden is true 1`] = ` disabled={false} onClick={[Function]} onDragStart={[Function]} - onKeyDown={[Function]} onKeyUp={[Function]} onMouseDown={[Function]} onMouseEnter={[Function]} diff --git a/packages/venia-ui/lib/components/CreateAccount/createAccount.js b/packages/venia-ui/lib/components/CreateAccount/createAccount.js index e109c299d4..20532958da 100644 --- a/packages/venia-ui/lib/components/CreateAccount/createAccount.js +++ b/packages/venia-ui/lib/components/CreateAccount/createAccount.js @@ -31,6 +31,7 @@ const CreateAccount = props => { errors, handleCancel, handleSubmit, + handleEnterKeyPress, isDisabled, initialValues, recaptchaWidgetProps @@ -60,6 +61,7 @@ const CreateAccount = props => { disabled={isDisabled} type="submit" priority="high" + onKeyDown={handleEnterKeyPress} data-cy="CreateAccount-submitButton" > { const { errors, handleCreateAccount, + handleEnterKeyPress, handleForgotPassword, handleSubmit, isBusy, @@ -123,6 +124,7 @@ const SignIn = props => { type="button" onClick={handleCreateAccount} data-cy="CreateAccount-initiateButton" + onKeyDown={handleEnterKeyPress} > Date: Fri, 11 Nov 2022 10:39:58 -0600 Subject: [PATCH 13/17] =?UTF-8?q?PWA-2971:=20[bug]:=20Gallery=20item=20Add?= =?UTF-8?q?=20To=20Cart=20configurable=20product=20redire=E2=80=A6=20(#400?= =?UTF-8?q?1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * PWA-2971: [bug]: Gallery item Add To Cart configurable product redirect URL doesn't match tile URL - prefix url suffix with slash to fix redirect - update test expectation * PWA-2971: [bug]: Gallery item Add To Cart configurable product redirect URL doesn't match tile URL - use resourceUrl util to generate redirect link --- .../talons/Gallery/__tests__/useAddToCartButton.spec.js | 2 +- .../peregrine/lib/talons/Gallery/useAddToCartButton.js | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/peregrine/lib/talons/Gallery/__tests__/useAddToCartButton.spec.js b/packages/peregrine/lib/talons/Gallery/__tests__/useAddToCartButton.spec.js index f47b384018..663927434e 100644 --- a/packages/peregrine/lib/talons/Gallery/__tests__/useAddToCartButton.spec.js +++ b/packages/peregrine/lib/talons/Gallery/__tests__/useAddToCartButton.spec.js @@ -222,7 +222,7 @@ describe('testing handleAddToCart', () => { await talonProps.handleAddToCart(); - expect(push).toHaveBeenCalledWith('configurable_product.suffix'); + expect(push).toHaveBeenCalledWith('/configurable_product.suffix'); }); test('should console warn if item is a bundle product', async () => { diff --git a/packages/peregrine/lib/talons/Gallery/useAddToCartButton.js b/packages/peregrine/lib/talons/Gallery/useAddToCartButton.js index a41afe530b..62cd40a40a 100644 --- a/packages/peregrine/lib/talons/Gallery/useAddToCartButton.js +++ b/packages/peregrine/lib/talons/Gallery/useAddToCartButton.js @@ -4,6 +4,7 @@ import { useHistory } from 'react-router-dom'; import { useCartContext } from '../../context/cart'; import { useEventingContext } from '../../context/eventing'; +import resourceUrl from '../../util/makeUrl'; import operations from './addToCart.gql'; /** @@ -91,7 +92,11 @@ export const useAddToCartButton = props => { setIsLoading(false); } else if (productType === 'ConfigurableProduct') { - history.push(`${item.url_key}${urlSuffix || ''}`); + const productLink = resourceUrl( + `/${item.url_key}${urlSuffix || ''}` + ); + + history.push(productLink); } else { console.warn('Unsupported product type unable to handle.'); } From 42b6d91909239c636ab57ef6ad3ed7feaf4b5b05 Mon Sep 17 00:00:00 2001 From: Aanchal Pawar <97873570+glo82145@users.noreply.github.com> Date: Fri, 11 Nov 2022 23:44:14 +0530 Subject: [PATCH 14/17] AC-2492::Missing visual text label for buttons (#3952) * AC-2492::Missing visual text label for buttons * AC-2492::Missing visual text label for buttons * AC-2492::added lint and preetier command feedabck * AC-2492::made changes according to thr PR comment * AC-2492::run yarn prettier on swatch.spec.js * AC-2492::run yarn prettier on swatch.spec.js * AC-2492::run yarn prettier on swatch.spec.js Co-authored-by: James Calcaben Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> --- .../__tests__/__snapshots__/swatch.spec.js.snap | 6 ++++++ .../__tests__/__snapshots__/swatchList.spec.js.snap | 1 + .../lib/components/ProductOptions/__tests__/swatch.spec.js | 3 ++- packages/venia-ui/lib/components/ProductOptions/option.js | 1 + packages/venia-ui/lib/components/ProductOptions/swatch.js | 7 +++++-- .../venia-ui/lib/components/ProductOptions/swatchList.js | 7 +++++-- 6 files changed, 20 insertions(+), 5 deletions(-) diff --git a/packages/venia-ui/lib/components/ProductOptions/__tests__/__snapshots__/swatch.spec.js.snap b/packages/venia-ui/lib/components/ProductOptions/__tests__/__snapshots__/swatch.spec.js.snap index 5bdb8560ca..dec380f1af 100644 --- a/packages/venia-ui/lib/components/ProductOptions/__tests__/__snapshots__/swatch.spec.js.snap +++ b/packages/venia-ui/lib/components/ProductOptions/__tests__/__snapshots__/swatch.spec.js.snap @@ -2,6 +2,7 @@ exports[`appends "_focused" to className if hasFocus is true 1`] = `