Merge branch 'trunk' into 11875/update-dummy-product-images

woocommerce · Dec 1, 2023 · 3033382 · 3033382
2 parents 70a62e2 + 04d37a8
commit 3033382
Show file tree

Hide file tree

Showing 12 changed files with 344 additions and 629 deletions.
diff --git a/assets/js/editor-components/feedback-prompt/index.tsx b/assets/js/editor-components/feedback-prompt/index.tsx
@@ -12,7 +12,7 @@ import './style.scss';
 interface FeedbackPromptProps {
 	text: string;
 	title?: string;
-	url?: string;
+	url: string;
 }
 /**
  * Component to render a Feedback prompt in the sidebar.
@@ -25,7 +25,7 @@ interface FeedbackPromptProps {
 const FeedbackPrompt = ( {
 	text,
 	title = __( 'Feedback?', 'woo-gutenberg-products-block' ),
-	url = 'https://ideas.woocommerce.com/forums/133476-woocommerce?category_id=384565',
+	url,
 }: FeedbackPromptProps ) => {
 	// By returning false we ensure that this component is not entered into the InspectorControls
 	// (which is a slot fill), children array on first render, on the second render when the state

diff --git a/assets/js/extensions/jetpack/woocommerce-analytics/constants.ts b/assets/js/extensions/jetpack/woocommerce-analytics/constants.ts
diff --git a/assets/js/extensions/jetpack/woocommerce-analytics/index.ts b/assets/js/extensions/jetpack/woocommerce-analytics/index.ts
diff --git a/assets/js/extensions/jetpack/woocommerce-analytics/test/index.ts b/assets/js/extensions/jetpack/woocommerce-analytics/test/index.ts
diff --git a/bin/webpack-entries.js b/bin/webpack-entries.js
@@ -240,8 +240,6 @@ const entries = {
 			'./assets/js/extensions/google-analytics/index.ts',
 		'wc-shipping-method-pickup-location':
 			'./assets/js/extensions/shipping-methods/pickup-location/index.js',
-		'wc-blocks-jetpack-woocommerce-analytics':
-			'./assets/js/extensions/jetpack/woocommerce-analytics/index.ts',
 	},
 	editor: {
 		'wc-blocks-classic-template-revert-button':