Cherry pick 4 commits from develop

- Cleanup wrong import path for page-designer component [#1441](#1441) @clavery
- Modularize country code source for targeting via extensibility [#1445](#1445) @bfeister
- Export icon helper function for target via overrides [#1420](#1420) @cbrother-csu
- Migrate Page Designer core types to commerce-sdk-react [#1441](#1441) @clavery

Author: bfeister

packages/template-retail-react-app/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## v2.0.0 (Sep 21, 2023)
 
 - V3 Fix checkout card number [#1424](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1424)
+- Cleanup wrong import path for page-designer component [#1441](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1441) @clavery
+- Modularize country code source for targeting via extensibility [#1445](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1445) @bfeister
+- Export icon helper function for target via overrides [#1420](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1420) @cbrother-csu
+- Migrate Page Designer core types to commerce-sdk-react [#1441](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1441) @clavery
 
 ## v1.0.1 (Jul 26, 2023)
 

packages/template-retail-react-app/app/components/forms/useAddressFields.jsx

@@ -10,6 +10,7 @@ import {
     stateOptions,
     provinceOptions
 } from '@salesforce/retail-react-app/app/components/forms/state-province-options'
+import {SHIPPING_COUNTRY_CODES} from '@salesforce/retail-react-app/app/constants'
 
 const messages = defineMessages({
     required: {defaultMessage: 'Required', id: 'use_address_fields.error.required'},
@@ -103,10 +104,7 @@ export default function useAddressFields({
             label: formatMessage(messages.country),
             defaultValue: 'US',
             type: 'select',
-            options: [
-                {value: 'CA', label: 'Canada'},
-                {value: 'US', label: 'United States'}
-            ],
+            options: SHIPPING_COUNTRY_CODES,
             rules: {
                 required: formatMessage({
                     defaultMessage: 'Please select your country.',

packages/template-retail-react-app/app/components/icons/index.jsx

@@ -84,7 +84,7 @@ VisaSymbol.viewBox = VisaSymbol.viewBox || '0 0 38 22'
  * @param {string} name - the filename of the imported svg (does not include extension)
  */
 /* istanbul ignore next */
-const icon = (name, passProps) => {
+export const icon = (name, passProps) => {
     const displayName = name
         .toLowerCase()
         .replace(/(?:^|[\s-/])\w/g, (match) => match.toUpperCase())

packages/template-retail-react-app/app/constants.js

@@ -107,3 +107,8 @@ export const EINSTEIN_RECOMMENDERS = {
     EMPTY_SEARCH_RESULTS_TOP_SELLERS: 'home-top-revenue-for-category',
     EMPTY_SEARCH_RESULTS_MOST_VIEWED: 'products-in-all-categories'
 }
+
+export const SHIPPING_COUNTRY_CODES = [
+    {value: 'CA', label: 'Canada'},
+    {value: 'US', label: 'United States'}
+]

packages/template-retail-react-app/app/page-designer/index.js

@@ -5,6 +5,6 @@
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import {Page, pageType} from '@salesforce/retail-react-app/app/page-designer/core'
+import {Page, pageType} from '@salesforce/commerce-sdk-react/components'
 
 export {Page, pageType}