From cd638721f9e133b2cf2f15ebb22157441a14127b Mon Sep 17 00:00:00 2001 From: Tung Du Date: Thu, 29 Aug 2024 22:23:40 +0700 Subject: [PATCH] [Experimental] Update folder structure for new product filter blocks (#51029) --- .../inner-blocks/active-filters/block.json | 0 .../active-filters/components/inspector.tsx | 0 .../components/removable-list-item.tsx | 0 .../inner-blocks/active-filters/edit.tsx | 0 .../inner-blocks/active-filters/frontend.ts | 2 +- .../inner-blocks/active-filters/index.tsx | 0 .../inner-blocks/active-filters/style.scss | 0 .../inner-blocks/active-filters/types.ts | 0 .../inner-blocks/attribute-filter/block.json | 0 .../components/attribute-dropdown.tsx | 0 .../components/attribute-select-controls.tsx | 0 .../components/checkbox-list-editor.tsx | 0 .../attribute-filter/components/inspector.tsx | 0 .../components/placeholder.tsx | 0 .../attribute-filter/constants.ts | 0 .../inner-blocks/attribute-filter/edit.tsx | 0 .../inner-blocks/attribute-filter/frontend.ts | 2 +- .../inner-blocks/attribute-filter/index.tsx | 0 .../inner-blocks/attribute-filter/style.scss | 0 .../inner-blocks/attribute-filter/types.ts | 0 .../inner-blocks/attribute-filter/utils.ts | 0 .../inner-blocks/clear-button/block.json | 0 .../inner-blocks/clear-button/edit.tsx | 0 .../inner-blocks/clear-button/frontend.ts | 2 +- .../inner-blocks/clear-button/index.tsx | 0 .../inner-blocks/clear-button/save.tsx | 0 .../components/preview-dropdown/index.tsx | 0 .../overlay-navigation}/block-variations.tsx | 0 .../overlay-navigation}/block.json | 0 .../inner-blocks/overlay-navigation}/edit.tsx | 4 ++-- .../overlay-navigation}/editor.scss | 0 .../overlay-navigation}/index.tsx | 0 .../inspector-controls.tsx | 0 .../inner-blocks/overlay-navigation}/save.tsx | 0 .../overlay-navigation}/style.scss | 0 .../inner-blocks/overlay-navigation}/types.ts | 2 +- .../inner-blocks/overlay}/block.json | 0 .../inner-blocks/overlay}/edit.tsx | 0 .../inner-blocks/overlay}/icon.tsx | 0 .../inner-blocks/overlay}/index.tsx | 0 .../inner-blocks/overlay}/save.tsx | 0 .../inner-blocks/overlay}/settings.ts | 0 .../inner-blocks/overlay}/types.ts | 0 .../inner-blocks/price-filter/block.json | 0 .../price-filter/components/inspector.tsx | 0 .../price-filter/components/price-slider.tsx | 0 .../inner-blocks/price-filter/edit.tsx | 0 .../inner-blocks/price-filter/frontend.ts | 2 +- .../inner-blocks/price-filter/index.tsx | 0 .../inner-blocks/price-filter/style.scss | 0 .../inner-blocks/price-filter/types.ts | 0 .../inner-blocks/price-filter/utils.ts | 0 .../product-filter/block-variations.tsx | 0 .../inner-blocks}/product-filter/block.json | 0 .../product-filter/components/warning.tsx | 0 .../inner-blocks}/product-filter/constants.ts | 0 .../inner-blocks}/product-filter/edit.tsx | 0 .../inner-blocks}/product-filter/editor.scss | 0 .../inner-blocks}/product-filter/frontend.ts | 0 .../inner-blocks}/product-filter/index.tsx | 0 .../inner-blocks}/product-filter/save.tsx | 0 .../inner-blocks}/product-filter/types.ts | 0 .../inner-blocks}/product-filter/utils.ts | 0 .../inner-blocks/rating-filter/block.json | 0 .../rating-filter/components/inspector.tsx | 0 .../inner-blocks/rating-filter/edit.tsx | 0 .../inner-blocks/rating-filter/frontend.ts | 2 +- .../inner-blocks/rating-filter/index.tsx | 0 .../inner-blocks/rating-filter/preview.tsx | 0 .../inner-blocks/rating-filter/style.scss | 0 .../inner-blocks/rating-filter/types.ts | 0 .../inner-blocks/rating-filter/utils.ts | 0 .../inner-blocks/stock-filter/block.json | 0 .../stock-filter/components/inspector.tsx | 0 .../inner-blocks/stock-filter/edit.tsx | 0 .../inner-blocks/stock-filter/frontend.ts | 2 +- .../inner-blocks/stock-filter/index.tsx | 0 .../inner-blocks/stock-filter/preview.tsx | 0 .../inner-blocks/stock-filter/style.scss | 0 .../inner-blocks/stock-filter/types.ts | 0 .../woocommerce-blocks/bin/webpack-entries.js | 21 +++++++++++-------- .../update-product-filters-folder-structure | 5 +++++ 82 files changed, 26 insertions(+), 18 deletions(-) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/active-filters/block.json (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/active-filters/components/inspector.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/active-filters/components/removable-list-item.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/active-filters/edit.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/active-filters/frontend.ts (90%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/active-filters/index.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/active-filters/style.scss (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/active-filters/types.ts (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/attribute-filter/block.json (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/attribute-filter/components/attribute-dropdown.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/attribute-filter/components/attribute-select-controls.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/attribute-filter/components/checkbox-list-editor.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/attribute-filter/components/inspector.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/attribute-filter/components/placeholder.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/attribute-filter/constants.ts (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/attribute-filter/edit.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/attribute-filter/frontend.ts (98%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/attribute-filter/index.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/attribute-filter/style.scss (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/attribute-filter/types.ts (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/attribute-filter/utils.ts (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/clear-button/block.json (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/clear-button/edit.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/clear-button/frontend.ts (96%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/clear-button/index.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/clear-button/save.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/components/preview-dropdown/index.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filters-overlay-navigation => product-filters/inner-blocks/overlay-navigation}/block-variations.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filters-overlay-navigation => product-filters/inner-blocks/overlay-navigation}/block.json (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filters-overlay-navigation => product-filters/inner-blocks/overlay-navigation}/edit.tsx (97%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filters-overlay-navigation => product-filters/inner-blocks/overlay-navigation}/editor.scss (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filters-overlay-navigation => product-filters/inner-blocks/overlay-navigation}/index.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filters-overlay-navigation => product-filters/inner-blocks/overlay-navigation}/inspector-controls.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filters-overlay-navigation => product-filters/inner-blocks/overlay-navigation}/save.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filters-overlay-navigation => product-filters/inner-blocks/overlay-navigation}/style.scss (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filters-overlay-navigation => product-filters/inner-blocks/overlay-navigation}/types.ts (96%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filters-overlay => product-filters/inner-blocks/overlay}/block.json (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filters-overlay => product-filters/inner-blocks/overlay}/edit.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filters-overlay => product-filters/inner-blocks/overlay}/icon.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filters-overlay => product-filters/inner-blocks/overlay}/index.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filters-overlay => product-filters/inner-blocks/overlay}/save.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filters-overlay => product-filters/inner-blocks/overlay}/settings.ts (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filters-overlay => product-filters/inner-blocks/overlay}/types.ts (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/price-filter/block.json (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/price-filter/components/inspector.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/price-filter/components/price-slider.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/price-filter/edit.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/price-filter/frontend.ts (99%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/price-filter/index.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/price-filter/style.scss (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/price-filter/types.ts (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/price-filter/utils.ts (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{ => product-filters/inner-blocks}/product-filter/block-variations.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{ => product-filters/inner-blocks}/product-filter/block.json (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{ => product-filters/inner-blocks}/product-filter/components/warning.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{ => product-filters/inner-blocks}/product-filter/constants.ts (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{ => product-filters/inner-blocks}/product-filter/edit.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{ => product-filters/inner-blocks}/product-filter/editor.scss (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{ => product-filters/inner-blocks}/product-filter/frontend.ts (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{ => product-filters/inner-blocks}/product-filter/index.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{ => product-filters/inner-blocks}/product-filter/save.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{ => product-filters/inner-blocks}/product-filter/types.ts (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{ => product-filters/inner-blocks}/product-filter/utils.ts (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/rating-filter/block.json (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/rating-filter/components/inspector.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/rating-filter/edit.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/rating-filter/frontend.ts (97%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/rating-filter/index.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/rating-filter/preview.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/rating-filter/style.scss (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/rating-filter/types.ts (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/rating-filter/utils.ts (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/stock-filter/block.json (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/stock-filter/components/inspector.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/stock-filter/edit.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/stock-filter/frontend.ts (98%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/stock-filter/index.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/stock-filter/preview.tsx (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/stock-filter/style.scss (100%) rename plugins/woocommerce-blocks/assets/js/blocks/{product-filter => product-filters}/inner-blocks/stock-filter/types.ts (100%) create mode 100644 plugins/woocommerce/changelog/update-product-filters-folder-structure diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/active-filters/block.json b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/active-filters/block.json similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/active-filters/block.json rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/active-filters/block.json diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/active-filters/components/inspector.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/active-filters/components/inspector.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/active-filters/components/inspector.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/active-filters/components/inspector.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/active-filters/components/removable-list-item.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/active-filters/components/removable-list-item.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/active-filters/components/removable-list-item.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/active-filters/components/removable-list-item.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/active-filters/edit.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/active-filters/edit.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/active-filters/edit.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/active-filters/edit.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/active-filters/frontend.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/active-filters/frontend.ts similarity index 90% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/active-filters/frontend.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/active-filters/frontend.ts index 69cab9093e1..0b462692f15 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/active-filters/frontend.ts +++ b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/active-filters/frontend.ts @@ -6,7 +6,7 @@ import { store, getContext } from '@woocommerce/interactivity'; /** * Internal dependencies */ -import { navigate } from '../../frontend'; +import { navigate } from '../product-filter/frontend'; type ActiveFiltersContext = { queryId: number; diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/active-filters/index.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/active-filters/index.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/active-filters/index.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/active-filters/index.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/active-filters/style.scss b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/active-filters/style.scss similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/active-filters/style.scss rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/active-filters/style.scss diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/active-filters/types.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/active-filters/types.ts similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/active-filters/types.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/active-filters/types.ts diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/block.json b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/block.json similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/block.json rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/block.json diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/components/attribute-dropdown.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/components/attribute-dropdown.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/components/attribute-dropdown.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/components/attribute-dropdown.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/components/attribute-select-controls.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/components/attribute-select-controls.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/components/attribute-select-controls.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/components/attribute-select-controls.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/components/checkbox-list-editor.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/components/checkbox-list-editor.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/components/checkbox-list-editor.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/components/checkbox-list-editor.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/components/inspector.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/components/inspector.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/components/inspector.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/components/inspector.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/components/placeholder.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/components/placeholder.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/components/placeholder.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/components/placeholder.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/constants.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/constants.ts similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/constants.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/constants.ts diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/edit.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/edit.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/edit.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/edit.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/frontend.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/frontend.ts similarity index 98% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/frontend.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/frontend.ts index 9c0300a8dd6..0f9eb935586 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/frontend.ts +++ b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/frontend.ts @@ -8,7 +8,7 @@ import { HTMLElementEvent } from '@woocommerce/types'; /** * Internal dependencies */ -import { navigate } from '../../frontend'; +import { navigate } from '../product-filter/frontend'; type AttributeFilterContext = { attributeSlug: string; diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/index.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/index.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/index.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/index.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/style.scss b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/style.scss similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/style.scss rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/style.scss diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/types.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/types.ts similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/types.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/types.ts diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/utils.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/utils.ts similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/attribute-filter/utils.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/attribute-filter/utils.ts diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/clear-button/block.json b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/clear-button/block.json similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/clear-button/block.json rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/clear-button/block.json diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/clear-button/edit.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/clear-button/edit.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/clear-button/edit.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/clear-button/edit.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/clear-button/frontend.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/clear-button/frontend.ts similarity index 96% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/clear-button/frontend.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/clear-button/frontend.ts index 7f1164ddf2d..0bfc299b660 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/clear-button/frontend.ts +++ b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/clear-button/frontend.ts @@ -6,7 +6,7 @@ import { store, getContext } from '@woocommerce/interactivity'; /** * Internal dependencies */ -import { navigate } from '../../frontend'; +import { navigate } from '../product-filter/frontend'; const getQueryParams = ( e: Event ) => { const filterNavContainer = ( e.target as HTMLElement )?.closest( diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/clear-button/index.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/clear-button/index.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/clear-button/index.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/clear-button/index.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/clear-button/save.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/clear-button/save.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/clear-button/save.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/clear-button/save.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/components/preview-dropdown/index.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/components/preview-dropdown/index.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/components/preview-dropdown/index.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/components/preview-dropdown/index.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/block-variations.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/block-variations.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/block-variations.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/block-variations.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/block.json b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/block.json similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/block.json rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/block.json diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/edit.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/edit.tsx similarity index 97% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/edit.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/edit.tsx index 58bec7471d0..43e026f95cf 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/edit.tsx +++ b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/edit.tsx @@ -16,8 +16,8 @@ import type { BlockContext, BlockVariationTriggerType, } from './types'; -import { default as productFiltersIcon } from '../product-filters/icon'; -import { BlockOverlayAttribute as ProductFiltersBlockOverlayAttribute } from '../product-filters/constants'; +import { default as productFiltersIcon } from '../../icon'; +import { BlockOverlayAttribute as ProductFiltersBlockOverlayAttribute } from '../../constants'; import './editor.scss'; import { Inspector } from './inspector-controls'; diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/editor.scss b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/editor.scss similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/editor.scss rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/editor.scss diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/index.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/index.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/index.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/index.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/inspector-controls.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/inspector-controls.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/inspector-controls.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/inspector-controls.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/save.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/save.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/save.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/save.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/style.scss b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/style.scss similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/style.scss rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/style.scss diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/types.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/types.ts similarity index 96% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/types.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/types.ts index 70d465198e2..e5694e1a323 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay-navigation/types.ts +++ b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay-navigation/types.ts @@ -1,7 +1,7 @@ /** * Internal dependencies */ -import { BlockOverlayAttributeOptions as ProductFiltersBlockOverlayAttributeOptions } from '../product-filters/types'; +import { BlockOverlayAttributeOptions as ProductFiltersBlockOverlayAttributeOptions } from '../../types'; type BorderRadius = { bottomLeft: string; diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay/block.json b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay/block.json similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay/block.json rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay/block.json diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay/edit.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay/edit.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay/edit.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay/edit.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay/icon.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay/icon.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay/icon.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay/icon.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay/index.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay/index.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay/index.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay/index.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay/save.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay/save.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay/save.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay/save.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay/settings.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay/settings.ts similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay/settings.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay/settings.ts diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay/types.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay/types.ts similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filters-overlay/types.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/overlay/types.ts diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/block.json b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/block.json similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/block.json rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/block.json diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/components/inspector.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/components/inspector.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/components/inspector.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/components/inspector.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/components/price-slider.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/components/price-slider.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/components/price-slider.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/components/price-slider.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/edit.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/edit.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/edit.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/edit.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/frontend.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/frontend.ts similarity index 99% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/frontend.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/frontend.ts index 482e3e51117..844e3c364f6 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/frontend.ts +++ b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/frontend.ts @@ -9,7 +9,7 @@ import { debounce } from '@woocommerce/base-utils'; /** * Internal dependencies */ -import { navigate } from '../../frontend'; +import { navigate } from '../product-filter/frontend'; import type { PriceFilterContext, PriceFilterStore } from './types'; const getUrl = ( context: PriceFilterContext ) => { diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/index.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/index.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/index.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/index.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/style.scss b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/style.scss similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/style.scss rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/style.scss diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/types.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/types.ts similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/types.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/types.ts diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/utils.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/utils.ts similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/price-filter/utils.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/price-filter/utils.ts diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/block-variations.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/block-variations.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/block-variations.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/block-variations.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/block.json b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/block.json similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/block.json rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/block.json diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/components/warning.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/components/warning.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/components/warning.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/components/warning.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/constants.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/constants.ts similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/constants.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/constants.ts diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/edit.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/edit.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/edit.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/edit.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/editor.scss b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/editor.scss similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/editor.scss rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/editor.scss diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/frontend.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/frontend.ts similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/frontend.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/frontend.ts diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/index.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/index.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/index.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/index.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/save.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/save.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/save.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/save.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/types.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/types.ts similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/types.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/types.ts diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/utils.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/utils.ts similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/utils.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/product-filter/utils.ts diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/block.json b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/block.json similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/block.json rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/block.json diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/components/inspector.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/components/inspector.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/components/inspector.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/components/inspector.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/edit.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/edit.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/edit.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/edit.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/frontend.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/frontend.ts similarity index 97% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/frontend.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/frontend.ts index 8d865131b33..3bd9f961704 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/frontend.ts +++ b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/frontend.ts @@ -8,7 +8,7 @@ import { DropdownContext } from '@woocommerce/interactivity-components/dropdown' /** * Internal dependencies */ -import { navigate } from '../../frontend'; +import { navigate } from '../product-filter/frontend'; function getUrl( filters: Array< string | null > ) { filters = filters.filter( Boolean ); diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/index.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/index.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/index.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/index.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/preview.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/preview.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/preview.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/preview.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/style.scss b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/style.scss similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/style.scss rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/style.scss diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/types.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/types.ts similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/types.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/types.ts diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/utils.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/utils.ts similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/rating-filter/utils.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/utils.ts diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/stock-filter/block.json b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/stock-filter/block.json similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/stock-filter/block.json rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/stock-filter/block.json diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/stock-filter/components/inspector.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/stock-filter/components/inspector.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/stock-filter/components/inspector.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/stock-filter/components/inspector.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/stock-filter/edit.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/stock-filter/edit.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/stock-filter/edit.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/stock-filter/edit.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/stock-filter/frontend.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/stock-filter/frontend.ts similarity index 98% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/stock-filter/frontend.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/stock-filter/frontend.ts index f0037014671..9833ff753c1 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/stock-filter/frontend.ts +++ b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/stock-filter/frontend.ts @@ -9,7 +9,7 @@ import { CheckboxListContext } from '@woocommerce/interactivity-components/check /** * Internal dependencies */ -import { navigate } from '../../frontend'; +import { navigate } from '../product-filter/frontend'; const getUrl = ( activeFilters: string ) => { const url = new URL( window.location.href ); diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/stock-filter/index.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/stock-filter/index.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/stock-filter/index.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/stock-filter/index.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/stock-filter/preview.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/stock-filter/preview.tsx similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/stock-filter/preview.tsx rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/stock-filter/preview.tsx diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/stock-filter/style.scss b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/stock-filter/style.scss similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/stock-filter/style.scss rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/stock-filter/style.scss diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/stock-filter/types.ts b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/stock-filter/types.ts similarity index 100% rename from plugins/woocommerce-blocks/assets/js/blocks/product-filter/inner-blocks/stock-filter/types.ts rename to plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/stock-filter/types.ts diff --git a/plugins/woocommerce-blocks/bin/webpack-entries.js b/plugins/woocommerce-blocks/bin/webpack-entries.js index 349468e1659..a3adb0662fc 100644 --- a/plugins/woocommerce-blocks/bin/webpack-entries.js +++ b/plugins/woocommerce-blocks/bin/webpack-entries.js @@ -85,40 +85,43 @@ const blocks = { }, 'single-product': {}, 'stock-filter': {}, - 'product-filter': { - isExperimental: true, - }, 'product-filters': { isExperimental: true, }, + 'product-filter': { + isExperimental: true, + customDir: 'product-filters/inner-blocks/product-filter', + }, 'product-filters-overlay': { isExperimental: true, + customDir: 'product-filters/inner-blocks/overlay', }, 'product-filters-overlay-navigation': { isExperimental: true, + customDir: 'product-filters/inner-blocks/overlay-navigation', }, 'product-filter-stock-status': { isExperimental: true, - customDir: 'product-filter/inner-blocks/stock-filter', + customDir: 'product-filters/inner-blocks/stock-filter', }, 'product-filter-price': { - customDir: 'product-filter/inner-blocks/price-filter', + customDir: 'product-filters/inner-blocks/price-filter', isExperimental: true, }, 'product-filter-attribute': { - customDir: 'product-filter/inner-blocks/attribute-filter', + customDir: 'product-filters/inner-blocks/attribute-filter', isExperimental: true, }, 'product-filter-rating': { - customDir: 'product-filter/inner-blocks/rating-filter', + customDir: 'product-filters/inner-blocks/rating-filter', isExperimental: true, }, 'product-filter-active': { - customDir: 'product-filter/inner-blocks/active-filters', + customDir: 'product-filters/inner-blocks/active-filters', isExperimental: true, }, 'product-filter-clear-button': { - customDir: 'product-filter/inner-blocks/clear-button', + customDir: 'product-filters/inner-blocks/clear-button', isExperimental: true, }, 'order-confirmation-summary': { diff --git a/plugins/woocommerce/changelog/update-product-filters-folder-structure b/plugins/woocommerce/changelog/update-product-filters-folder-structure new file mode 100644 index 00000000000..4904e404d8e --- /dev/null +++ b/plugins/woocommerce/changelog/update-product-filters-folder-structure @@ -0,0 +1,5 @@ +Significance: patch +Type: update +Comment: Update the folder structure of new filter blocks. + +