From 36da77e3de79c5c5b491afe453329aa0a49d113c Mon Sep 17 00:00:00 2001 From: Patryk Tomczyk <13100280+patzick@users.noreply.github.com> Date: Wed, 14 Oct 2020 14:36:15 +0200 Subject: [PATCH] refactor(default-theme): structure moved to src for multitheme (#1175) --- .../deploy-preview-storefrontcloud.yml | 52 ++++++++++ .github/workflows/publish-canary.yml | 52 ++++++++++ package.json | 2 +- packages/cli/package.json | 2 +- packages/cli/src/commands/build-theme.ts | 16 +-- packages/cli/src/commands/create-theme.ts | 5 +- packages/cli/src/commands/init.ts | 1 + .../src/extensions/shopware-pwa-extension.ts | 10 ++ packages/default-theme/.gitignore | 96 +----------------- packages/default-theme/.npmignore | 3 - packages/default-theme/README.md | 2 +- .../app/router.scrollBehavior.js | 7 -- packages/default-theme/helpers/formatPrice.js | 20 ---- packages/default-theme/logic/index.js | 1 - packages/default-theme/logic/useLocales.js | 28 ----- packages/default-theme/package.json | 16 +-- packages/default-theme/sfui.scss | 6 -- packages/default-theme/{ => src}/.babelrc | 0 .../default-theme/{ => src}/.editorconfig | 0 packages/default-theme/{ => src}/.eslintrc.js | 0 packages/default-theme/{ => src}/.prettierrc | 0 .../default-theme/{ => src}/assets/error.svg | 0 .../default-theme/{ => src}/assets/flag.png | Bin .../{ => src}/assets/productB.jpg | Bin .../{ => src}/assets/scss/forms.scss | 0 .../{ => src}/assets/scss/main.scss | 0 .../{ => src}/assets/scss/variables.scss | 0 .../{ => src}/cms/CmsGenericBlock.vue | 0 .../{ => src}/cms/CmsGenericElement.vue | 0 .../{ => src}/cms/CmsGenericSection.vue | 0 .../{ => src}/cms/CmsNoComponent.vue | 0 .../default-theme/{ => src}/cms/CmsPage.vue | 0 .../cms/blocks/CmsBlockCategoryNavigation.vue | 0 .../cms/blocks/CmsBlockCenterText.vue | 0 .../{ => src}/cms/blocks/CmsBlockDefault.vue | 0 .../{ => src}/cms/blocks/CmsBlockForms.vue | 0 .../cms/blocks/CmsBlockImageBubbleRow.vue | 0 .../cms/blocks/CmsBlockImageCover.vue | 0 .../cms/blocks/CmsBlockImageFourColumn.vue | 0 .../cms/blocks/CmsBlockImageHighlightRow.vue | 0 .../cms/blocks/CmsBlockImageSimpleGrid.vue | 0 .../cms/blocks/CmsBlockImageText.vue | 0 .../cms/blocks/CmsBlockImageTextCover.vue | 0 .../cms/blocks/CmsBlockImageTextGallery.vue | 0 .../cms/blocks/CmsBlockImageThreeColumn.vue | 0 .../cms/blocks/CmsBlockImageThreeCover.vue | 0 .../cms/blocks/CmsBlockImageTwoColumn.vue | 0 .../cms/blocks/CmsBlockProductListing.vue | 0 .../cms/blocks/CmsBlockProductThreeColumn.vue | 0 .../cms/blocks/CmsBlockTextOnImage.vue | 0 .../cms/blocks/CmsBlockTextThreeColumn.vue | 0 .../cms/blocks/CmsBlockTextTwoColumn.vue | 0 .../default-theme/{ => src}/cms/cmsMap.json | 0 .../elements/CmsElementCategoryNavigation.vue | 0 .../CmsElementCategorySidebarFilter.vue | 0 .../cms/elements/CmsElementContactForm.vue | 0 .../{ => src}/cms/elements/CmsElementForm.vue | 0 .../cms/elements/CmsElementImage.vue | 0 .../cms/elements/CmsElementImageSlider.vue | 0 .../cms/elements/CmsElementNesletterForm.vue | 0 .../cms/elements/CmsElementProductCard.vue | 0 .../cms/elements/CmsElementProductListing.vue | 0 .../cms/elements/CmsElementProductSlider.vue | 0 .../{ => src}/cms/elements/CmsElementText.vue | 0 .../cms/elements/CmsElementVideoVimeo.vue | 0 .../cms/elements/CmsElementVideoYoutube.vue | 0 .../cms/sections/CmsSectionDefault.vue | 0 .../cms/sections/CmsSectionSidebar.vue | 0 .../default-theme/{ => src}/cms/settings.scss | 0 .../{ => src}/components/SwAddress.vue | 0 .../{ => src}/components/SwAddressList.vue | 0 .../{ => src}/components/SwBottomMenu.vue | 0 .../components/SwBottomMoreActions.vue | 0 .../components/SwBottomNavigation.vue | 0 .../{ => src}/components/SwCart.vue | 0 .../{ => src}/components/SwCartProduct.vue | 0 .../{ => src}/components/SwCheckoutMethod.vue | 0 .../components/SwCurrencySwitcher.vue | 0 .../{ => src}/components/SwErrorsList.vue | 0 .../{ => src}/components/SwFooter.vue | 0 .../{ => src}/components/SwHeader.vue | 0 .../{ => src}/components/SwHeaderIcons.vue | 0 .../components/SwLanguageSwitcher.vue | 0 .../{ => src}/components/SwLogin.vue | 0 .../{ => src}/components/SwLogo.vue | 0 .../{ => src}/components/SwMegaMenu.vue | 0 .../{ => src}/components/SwNotifications.vue | 0 .../{ => src}/components/SwOfflineMode.vue | 0 .../{ => src}/components/SwOrderDetails.vue | 0 .../components/SwOrderDetailsItem.vue | 0 .../components/SwPersonalDetails.vue | 0 .../components/SwProductAdvertisement.vue | 0 .../{ => src}/components/SwProductCard.vue | 0 .../components/SwProductCardHorizontal.vue | 0 .../components/SwProductCarousel.vue | 0 .../{ => src}/components/SwProductColors.vue | 0 .../{ => src}/components/SwProductDetails.vue | 0 .../{ => src}/components/SwProductGallery.vue | 0 .../{ => src}/components/SwProductHeading.vue | 0 .../{ => src}/components/SwProductListing.vue | 0 .../components/SwProductListingFilters.vue | 0 .../{ => src}/components/SwProductSelect.vue | 0 .../{ => src}/components/SwProductTabs.vue | 0 .../{ => src}/components/SwPromoCode.vue | 0 .../{ => src}/components/SwPromoCodeItem.vue | 0 .../{ => src}/components/SwRegister.vue | 0 .../{ => src}/components/SwResetPassword.vue | 0 .../{ => src}/components/SwSearchBar.vue | 0 .../{ => src}/components/SwSuggestSearch.vue | 0 .../{ => src}/components/SwTierPrices.vue | 0 .../{ => src}/components/SwTopBar.vue | 0 .../{ => src}/components/SwTopNavigation.vue | 0 .../components/SwTopNavigationShowMore.vue | 0 .../{ => src}/components/SwTotals.vue | 0 .../account/MyAddresses/Address.vue | 0 .../components/account/orders/Order.vue | 0 .../{ => src}/components/atoms/SwAlert.vue | 0 .../{ => src}/components/atoms/SwButton.vue | 0 .../components/atoms/SwGoBackArrow.vue | 0 .../{ => src}/components/atoms/SwImage.vue | 0 .../{ => src}/components/atoms/SwInput.vue | 0 .../{ => src}/components/atoms/SwLink.vue | 0 .../{ => src}/components/atoms/SwRating.vue | 0 .../checkout/sidebar/SidebarOrderReview.vue | 0 .../checkout/sidebar/SidebarOrderSummary.vue | 0 .../checkout/steps/OrderReviewStep.vue | 0 .../components/checkout/steps/PaymentStep.vue | 0 .../checkout/steps/PersonalDetailsStep.vue | 0 .../checkout/steps/ShippingStep.vue | 0 .../steps/guest/BillingAddressGuestForm.vue | 0 .../steps/guest/PersonalDetailsGuestForm.vue | 0 .../steps/guest/ShippingAddressGuestForm.vue | 0 .../steps/user/BillingAddressUserForm.vue | 0 .../steps/user/PersonalDetailsUserForm.vue | 0 .../steps/user/ShippingAddressUserForm.vue | 0 .../summary/BillingAddressSummary.vue | 0 .../components/checkout/summary/OrderItem.vue | 0 .../checkout/summary/OrderItemsTable.vue | 0 .../checkout/summary/PaymentMethodSummary.vue | 0 .../summary/PersonalDetailsSummary.vue | 0 .../summary/ShippingAddressSummary.vue | 0 .../checkout/summary/TotalsSummary.vue | 0 .../components/forms/SwAddressForm.vue | 0 .../{ => src}/components/forms/SwPassword.vue | 0 .../components/forms/SwPersonalInfo.vue | 0 .../{ => src}/components/gdpr/SwCookieBar.vue | 0 .../components/gdpr/SwCookieBarContent.vue | 0 .../components/listing/NoFilterFound.vue | 0 .../listing/SwProductListingFilter.vue | 0 .../components/listing/types/color.vue | 0 .../components/listing/types/content.vue | 0 .../components/listing/types/entity.vue | 0 .../components/listing/types/fabric.vue | 0 .../components/listing/types/length.vue | 0 .../components/listing/types/manufacturer.vue | 0 .../components/listing/types/max.vue | 0 .../components/listing/types/price.vue | 0 .../components/listing/types/range.vue | 0 .../components/listing/types/rating.vue | 0 .../listing/types/shipping-free.vue | 0 .../components/listing/types/size.vue | 0 .../components/listing/types/textile.vue | 0 .../components/listing/types/tone.vue | 0 .../components/listing/types/width.vue | 0 .../components/modals/SwLoginModal.vue | 0 .../organisms/SwFooterNavigation.vue | 0 .../components/views/CategoryView.vue | 0 .../components/views/ProductView.vue | 0 .../default-theme/{ => src}/helpers/index.js | 3 +- .../default-theme/{ => src}/helpers/pages.js | 0 .../{ => src}/layouts/default.vue | 0 .../default-theme/{ => src}/layouts/error.vue | 0 .../{ => src}/locales/de-DE.json | 0 .../{ => src}/locales/en-GB.json | 0 .../{ => src}/logic/checkout/helpers.js | 0 .../{ => src}/logic/checkout/index.js | 0 .../{ => src}/logic/checkout/steps.js | 0 .../logic/checkout/usePaymentStep.js | 0 .../logic/checkout/usePersonalDetailsStep.js | 0 .../logic/checkout/useShippingStep.js | 0 .../logic/checkout/useUICheckoutPage.js | 0 packages/default-theme/src/logic/index.js | 1 + .../{ => src}/middleware/auth.js | 0 .../{ => src}/middleware/checkout.js | 0 packages/default-theme/{ => src}/pages/_.vue | 0 .../default-theme/{ => src}/pages/_lang/_.vue | 0 .../{ => src}/pages/_lang/account.vue | 0 .../pages/_lang/account/addresses.vue | 0 .../pages/_lang/account/addresses/add/_id.vue | 0 .../_lang/account/addresses/add/index.vue | 0 .../pages/_lang/account/addresses/index.vue | 0 .../{ => src}/pages/_lang/account/orders.vue | 0 .../pages/_lang/account/orders/_id.vue | 0 .../pages/_lang/account/orders/index.vue | 0 .../{ => src}/pages/_lang/account/profile.vue | 0 .../{ => src}/pages/_lang/checkout.vue | 0 .../{ => src}/pages/_lang/login.vue | 0 .../{ => src}/pages/_lang/order.vue | 0 .../{ => src}/pages/_lang/search.vue | 0 .../default-theme/{ => src}/pages/account.vue | 0 .../{ => src}/pages/account/addresses.vue | 0 .../pages/account/addresses/add/_id.vue | 0 .../pages/account/addresses/add/index.vue | 0 .../pages/account/addresses/index.vue | 0 .../{ => src}/pages/account/orders.vue | 0 .../{ => src}/pages/account/orders/_id.vue | 0 .../{ => src}/pages/account/orders/index.vue | 0 .../{ => src}/pages/account/profile.vue | 0 .../{ => src}/pages/checkout.vue | 0 .../default-theme/{ => src}/pages/login.vue | 0 .../default-theme/{ => src}/pages/order.vue | 0 .../default-theme/{ => src}/pages/search.vue | 0 .../{ => src}/plugins/notifications.js | 0 .../{ => src}/static/favicon.ico | Bin .../default-theme/{ => src}/static/icon.png | Bin .../{ => src}/static/img/apple.png | Bin .../{ => src}/static/img/bannerD.png | Bin .../{ => src}/static/img/debit.png | Bin .../{ => src}/static/img/electron.png | Bin .../{ => src}/static/img/google.png | Bin .../{ => src}/static/img/imageA.png | Bin .../{ => src}/static/img/imageB.png | Bin .../{ => src}/static/img/imageC.png | Bin .../{ => src}/static/img/imageD.png | Bin .../{ => src}/static/img/logo.svg | 0 .../{ => src}/static/img/mastercard.png | Bin .../{ => src}/static/img/productA.png | Bin .../{ => src}/static/img/productB.png | Bin .../{ => src}/static/img/productC.png | Bin packages/default-theme/src/static/sw.js | 1 + packages/default-theme/store/index.js | 49 --------- .../__tests__/useThemeAndProjectFiles.spec.ts | 24 ++++- packages/nuxt-module/package.json | 2 +- packages/nuxt-module/src/theme.ts | 21 ++++ packages/theme-base/.gitignore | 2 +- .../app/router.scrollBehavior.js | 0 .../{src => dist}/assets/scss/main.scss | 0 .../{src => dist}/assets/scss/variables.scss | 0 .../theme-base/{src => dist}/cms/cmsMap.json | 0 .../{src => dist}/helpers/formatPrice.js | 0 .../{src => dist}/layouts/default.vue | 0 .../{src => dist}/locales/de-DE.json | 0 .../{src => dist}/locales/en-GB.json | 0 .../{src => dist}/logic/useLocales.js | 0 packages/theme-base/{src => dist}/pages/_.vue | 0 .../{src => dist}/pages/_lang/_.vue | 0 .../theme-base/{src => dist}/store/index.js | 0 packages/theme-base/package.json | 12 +-- scripts/build.js | 39 ++++--- scripts/linkDependencies.js | 20 +++- scripts/release.js | 11 +- scripts/utils.js | 2 +- yarn.lock | 22 ++++ 253 files changed, 259 insertions(+), 269 deletions(-) delete mode 100644 packages/default-theme/.npmignore delete mode 100644 packages/default-theme/app/router.scrollBehavior.js delete mode 100644 packages/default-theme/helpers/formatPrice.js delete mode 100644 packages/default-theme/logic/index.js delete mode 100644 packages/default-theme/logic/useLocales.js delete mode 100644 packages/default-theme/sfui.scss rename packages/default-theme/{ => src}/.babelrc (100%) rename packages/default-theme/{ => src}/.editorconfig (100%) rename packages/default-theme/{ => src}/.eslintrc.js (100%) rename packages/default-theme/{ => src}/.prettierrc (100%) rename packages/default-theme/{ => src}/assets/error.svg (100%) rename packages/default-theme/{ => src}/assets/flag.png (100%) rename packages/default-theme/{ => src}/assets/productB.jpg (100%) rename packages/default-theme/{ => src}/assets/scss/forms.scss (100%) rename packages/default-theme/{ => src}/assets/scss/main.scss (100%) rename packages/default-theme/{ => src}/assets/scss/variables.scss (100%) rename packages/default-theme/{ => src}/cms/CmsGenericBlock.vue (100%) rename packages/default-theme/{ => src}/cms/CmsGenericElement.vue (100%) rename packages/default-theme/{ => src}/cms/CmsGenericSection.vue (100%) rename packages/default-theme/{ => src}/cms/CmsNoComponent.vue (100%) rename packages/default-theme/{ => src}/cms/CmsPage.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockCategoryNavigation.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockCenterText.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockDefault.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockForms.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockImageBubbleRow.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockImageCover.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockImageFourColumn.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockImageHighlightRow.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockImageSimpleGrid.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockImageText.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockImageTextCover.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockImageTextGallery.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockImageThreeColumn.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockImageThreeCover.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockImageTwoColumn.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockProductListing.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockProductThreeColumn.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockTextOnImage.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockTextThreeColumn.vue (100%) rename packages/default-theme/{ => src}/cms/blocks/CmsBlockTextTwoColumn.vue (100%) rename packages/default-theme/{ => src}/cms/cmsMap.json (100%) rename packages/default-theme/{ => src}/cms/elements/CmsElementCategoryNavigation.vue (100%) rename packages/default-theme/{ => src}/cms/elements/CmsElementCategorySidebarFilter.vue (100%) rename packages/default-theme/{ => src}/cms/elements/CmsElementContactForm.vue (100%) rename packages/default-theme/{ => src}/cms/elements/CmsElementForm.vue (100%) rename packages/default-theme/{ => src}/cms/elements/CmsElementImage.vue (100%) rename packages/default-theme/{ => src}/cms/elements/CmsElementImageSlider.vue (100%) rename packages/default-theme/{ => src}/cms/elements/CmsElementNesletterForm.vue (100%) rename packages/default-theme/{ => src}/cms/elements/CmsElementProductCard.vue (100%) rename packages/default-theme/{ => src}/cms/elements/CmsElementProductListing.vue (100%) rename packages/default-theme/{ => src}/cms/elements/CmsElementProductSlider.vue (100%) rename packages/default-theme/{ => src}/cms/elements/CmsElementText.vue (100%) rename packages/default-theme/{ => src}/cms/elements/CmsElementVideoVimeo.vue (100%) rename packages/default-theme/{ => src}/cms/elements/CmsElementVideoYoutube.vue (100%) rename packages/default-theme/{ => src}/cms/sections/CmsSectionDefault.vue (100%) rename packages/default-theme/{ => src}/cms/sections/CmsSectionSidebar.vue (100%) rename packages/default-theme/{ => src}/cms/settings.scss (100%) rename packages/default-theme/{ => src}/components/SwAddress.vue (100%) rename packages/default-theme/{ => src}/components/SwAddressList.vue (100%) rename packages/default-theme/{ => src}/components/SwBottomMenu.vue (100%) rename packages/default-theme/{ => src}/components/SwBottomMoreActions.vue (100%) rename packages/default-theme/{ => src}/components/SwBottomNavigation.vue (100%) rename packages/default-theme/{ => src}/components/SwCart.vue (100%) rename packages/default-theme/{ => src}/components/SwCartProduct.vue (100%) rename packages/default-theme/{ => src}/components/SwCheckoutMethod.vue (100%) rename packages/default-theme/{ => src}/components/SwCurrencySwitcher.vue (100%) rename packages/default-theme/{ => src}/components/SwErrorsList.vue (100%) rename packages/default-theme/{ => src}/components/SwFooter.vue (100%) rename packages/default-theme/{ => src}/components/SwHeader.vue (100%) rename packages/default-theme/{ => src}/components/SwHeaderIcons.vue (100%) rename packages/default-theme/{ => src}/components/SwLanguageSwitcher.vue (100%) rename packages/default-theme/{ => src}/components/SwLogin.vue (100%) rename packages/default-theme/{ => src}/components/SwLogo.vue (100%) rename packages/default-theme/{ => src}/components/SwMegaMenu.vue (100%) rename packages/default-theme/{ => src}/components/SwNotifications.vue (100%) rename packages/default-theme/{ => src}/components/SwOfflineMode.vue (100%) rename packages/default-theme/{ => src}/components/SwOrderDetails.vue (100%) rename packages/default-theme/{ => src}/components/SwOrderDetailsItem.vue (100%) rename packages/default-theme/{ => src}/components/SwPersonalDetails.vue (100%) rename packages/default-theme/{ => src}/components/SwProductAdvertisement.vue (100%) rename packages/default-theme/{ => src}/components/SwProductCard.vue (100%) rename packages/default-theme/{ => src}/components/SwProductCardHorizontal.vue (100%) rename packages/default-theme/{ => src}/components/SwProductCarousel.vue (100%) rename packages/default-theme/{ => src}/components/SwProductColors.vue (100%) rename packages/default-theme/{ => src}/components/SwProductDetails.vue (100%) rename packages/default-theme/{ => src}/components/SwProductGallery.vue (100%) rename packages/default-theme/{ => src}/components/SwProductHeading.vue (100%) rename packages/default-theme/{ => src}/components/SwProductListing.vue (100%) rename packages/default-theme/{ => src}/components/SwProductListingFilters.vue (100%) rename packages/default-theme/{ => src}/components/SwProductSelect.vue (100%) rename packages/default-theme/{ => src}/components/SwProductTabs.vue (100%) rename packages/default-theme/{ => src}/components/SwPromoCode.vue (100%) rename packages/default-theme/{ => src}/components/SwPromoCodeItem.vue (100%) rename packages/default-theme/{ => src}/components/SwRegister.vue (100%) rename packages/default-theme/{ => src}/components/SwResetPassword.vue (100%) rename packages/default-theme/{ => src}/components/SwSearchBar.vue (100%) rename packages/default-theme/{ => src}/components/SwSuggestSearch.vue (100%) rename packages/default-theme/{ => src}/components/SwTierPrices.vue (100%) rename packages/default-theme/{ => src}/components/SwTopBar.vue (100%) rename packages/default-theme/{ => src}/components/SwTopNavigation.vue (100%) rename packages/default-theme/{ => src}/components/SwTopNavigationShowMore.vue (100%) rename packages/default-theme/{ => src}/components/SwTotals.vue (100%) rename packages/default-theme/{ => src}/components/account/MyAddresses/Address.vue (100%) rename packages/default-theme/{ => src}/components/account/orders/Order.vue (100%) rename packages/default-theme/{ => src}/components/atoms/SwAlert.vue (100%) rename packages/default-theme/{ => src}/components/atoms/SwButton.vue (100%) rename packages/default-theme/{ => src}/components/atoms/SwGoBackArrow.vue (100%) rename packages/default-theme/{ => src}/components/atoms/SwImage.vue (100%) rename packages/default-theme/{ => src}/components/atoms/SwInput.vue (100%) rename packages/default-theme/{ => src}/components/atoms/SwLink.vue (100%) rename packages/default-theme/{ => src}/components/atoms/SwRating.vue (100%) rename packages/default-theme/{ => src}/components/checkout/sidebar/SidebarOrderReview.vue (100%) rename packages/default-theme/{ => src}/components/checkout/sidebar/SidebarOrderSummary.vue (100%) rename packages/default-theme/{ => src}/components/checkout/steps/OrderReviewStep.vue (100%) rename packages/default-theme/{ => src}/components/checkout/steps/PaymentStep.vue (100%) rename packages/default-theme/{ => src}/components/checkout/steps/PersonalDetailsStep.vue (100%) rename packages/default-theme/{ => src}/components/checkout/steps/ShippingStep.vue (100%) rename packages/default-theme/{ => src}/components/checkout/steps/guest/BillingAddressGuestForm.vue (100%) rename packages/default-theme/{ => src}/components/checkout/steps/guest/PersonalDetailsGuestForm.vue (100%) rename packages/default-theme/{ => src}/components/checkout/steps/guest/ShippingAddressGuestForm.vue (100%) rename packages/default-theme/{ => src}/components/checkout/steps/user/BillingAddressUserForm.vue (100%) rename packages/default-theme/{ => src}/components/checkout/steps/user/PersonalDetailsUserForm.vue (100%) rename packages/default-theme/{ => src}/components/checkout/steps/user/ShippingAddressUserForm.vue (100%) rename packages/default-theme/{ => src}/components/checkout/summary/BillingAddressSummary.vue (100%) rename packages/default-theme/{ => src}/components/checkout/summary/OrderItem.vue (100%) rename packages/default-theme/{ => src}/components/checkout/summary/OrderItemsTable.vue (100%) rename packages/default-theme/{ => src}/components/checkout/summary/PaymentMethodSummary.vue (100%) rename packages/default-theme/{ => src}/components/checkout/summary/PersonalDetailsSummary.vue (100%) rename packages/default-theme/{ => src}/components/checkout/summary/ShippingAddressSummary.vue (100%) rename packages/default-theme/{ => src}/components/checkout/summary/TotalsSummary.vue (100%) rename packages/default-theme/{ => src}/components/forms/SwAddressForm.vue (100%) rename packages/default-theme/{ => src}/components/forms/SwPassword.vue (100%) rename packages/default-theme/{ => src}/components/forms/SwPersonalInfo.vue (100%) rename packages/default-theme/{ => src}/components/gdpr/SwCookieBar.vue (100%) rename packages/default-theme/{ => src}/components/gdpr/SwCookieBarContent.vue (100%) rename packages/default-theme/{ => src}/components/listing/NoFilterFound.vue (100%) rename packages/default-theme/{ => src}/components/listing/SwProductListingFilter.vue (100%) rename packages/default-theme/{ => src}/components/listing/types/color.vue (100%) rename packages/default-theme/{ => src}/components/listing/types/content.vue (100%) rename packages/default-theme/{ => src}/components/listing/types/entity.vue (100%) rename packages/default-theme/{ => src}/components/listing/types/fabric.vue (100%) rename packages/default-theme/{ => src}/components/listing/types/length.vue (100%) rename packages/default-theme/{ => src}/components/listing/types/manufacturer.vue (100%) rename packages/default-theme/{ => src}/components/listing/types/max.vue (100%) rename packages/default-theme/{ => src}/components/listing/types/price.vue (100%) rename packages/default-theme/{ => src}/components/listing/types/range.vue (100%) rename packages/default-theme/{ => src}/components/listing/types/rating.vue (100%) rename packages/default-theme/{ => src}/components/listing/types/shipping-free.vue (100%) rename packages/default-theme/{ => src}/components/listing/types/size.vue (100%) rename packages/default-theme/{ => src}/components/listing/types/textile.vue (100%) rename packages/default-theme/{ => src}/components/listing/types/tone.vue (100%) rename packages/default-theme/{ => src}/components/listing/types/width.vue (100%) rename packages/default-theme/{ => src}/components/modals/SwLoginModal.vue (100%) rename packages/default-theme/{ => src}/components/organisms/SwFooterNavigation.vue (100%) rename packages/default-theme/{ => src}/components/views/CategoryView.vue (100%) rename packages/default-theme/{ => src}/components/views/ProductView.vue (100%) rename packages/default-theme/{ => src}/helpers/index.js (89%) rename packages/default-theme/{ => src}/helpers/pages.js (100%) rename packages/default-theme/{ => src}/layouts/default.vue (100%) rename packages/default-theme/{ => src}/layouts/error.vue (100%) rename packages/default-theme/{ => src}/locales/de-DE.json (100%) rename packages/default-theme/{ => src}/locales/en-GB.json (100%) rename packages/default-theme/{ => src}/logic/checkout/helpers.js (100%) rename packages/default-theme/{ => src}/logic/checkout/index.js (100%) rename packages/default-theme/{ => src}/logic/checkout/steps.js (100%) rename packages/default-theme/{ => src}/logic/checkout/usePaymentStep.js (100%) rename packages/default-theme/{ => src}/logic/checkout/usePersonalDetailsStep.js (100%) rename packages/default-theme/{ => src}/logic/checkout/useShippingStep.js (100%) rename packages/default-theme/{ => src}/logic/checkout/useUICheckoutPage.js (100%) create mode 100644 packages/default-theme/src/logic/index.js rename packages/default-theme/{ => src}/middleware/auth.js (100%) rename packages/default-theme/{ => src}/middleware/checkout.js (100%) rename packages/default-theme/{ => src}/pages/_.vue (100%) rename packages/default-theme/{ => src}/pages/_lang/_.vue (100%) rename packages/default-theme/{ => src}/pages/_lang/account.vue (100%) rename packages/default-theme/{ => src}/pages/_lang/account/addresses.vue (100%) rename packages/default-theme/{ => src}/pages/_lang/account/addresses/add/_id.vue (100%) rename packages/default-theme/{ => src}/pages/_lang/account/addresses/add/index.vue (100%) rename packages/default-theme/{ => src}/pages/_lang/account/addresses/index.vue (100%) rename packages/default-theme/{ => src}/pages/_lang/account/orders.vue (100%) rename packages/default-theme/{ => src}/pages/_lang/account/orders/_id.vue (100%) rename packages/default-theme/{ => src}/pages/_lang/account/orders/index.vue (100%) rename packages/default-theme/{ => src}/pages/_lang/account/profile.vue (100%) rename packages/default-theme/{ => src}/pages/_lang/checkout.vue (100%) rename packages/default-theme/{ => src}/pages/_lang/login.vue (100%) rename packages/default-theme/{ => src}/pages/_lang/order.vue (100%) rename packages/default-theme/{ => src}/pages/_lang/search.vue (100%) rename packages/default-theme/{ => src}/pages/account.vue (100%) rename packages/default-theme/{ => src}/pages/account/addresses.vue (100%) rename packages/default-theme/{ => src}/pages/account/addresses/add/_id.vue (100%) rename packages/default-theme/{ => src}/pages/account/addresses/add/index.vue (100%) rename packages/default-theme/{ => src}/pages/account/addresses/index.vue (100%) rename packages/default-theme/{ => src}/pages/account/orders.vue (100%) rename packages/default-theme/{ => src}/pages/account/orders/_id.vue (100%) rename packages/default-theme/{ => src}/pages/account/orders/index.vue (100%) rename packages/default-theme/{ => src}/pages/account/profile.vue (100%) rename packages/default-theme/{ => src}/pages/checkout.vue (100%) rename packages/default-theme/{ => src}/pages/login.vue (100%) rename packages/default-theme/{ => src}/pages/order.vue (100%) rename packages/default-theme/{ => src}/pages/search.vue (100%) rename packages/default-theme/{ => src}/plugins/notifications.js (100%) rename packages/default-theme/{ => src}/static/favicon.ico (100%) rename packages/default-theme/{ => src}/static/icon.png (100%) rename packages/default-theme/{ => src}/static/img/apple.png (100%) rename packages/default-theme/{ => src}/static/img/bannerD.png (100%) rename packages/default-theme/{ => src}/static/img/debit.png (100%) rename packages/default-theme/{ => src}/static/img/electron.png (100%) rename packages/default-theme/{ => src}/static/img/google.png (100%) rename packages/default-theme/{ => src}/static/img/imageA.png (100%) rename packages/default-theme/{ => src}/static/img/imageB.png (100%) rename packages/default-theme/{ => src}/static/img/imageC.png (100%) rename packages/default-theme/{ => src}/static/img/imageD.png (100%) rename packages/default-theme/{ => src}/static/img/logo.svg (100%) rename packages/default-theme/{ => src}/static/img/mastercard.png (100%) rename packages/default-theme/{ => src}/static/img/productA.png (100%) rename packages/default-theme/{ => src}/static/img/productB.png (100%) rename packages/default-theme/{ => src}/static/img/productC.png (100%) create mode 100644 packages/default-theme/src/static/sw.js delete mode 100644 packages/default-theme/store/index.js rename packages/theme-base/{src => dist}/app/router.scrollBehavior.js (100%) rename packages/theme-base/{src => dist}/assets/scss/main.scss (100%) rename packages/theme-base/{src => dist}/assets/scss/variables.scss (100%) rename packages/theme-base/{src => dist}/cms/cmsMap.json (100%) rename packages/theme-base/{src => dist}/helpers/formatPrice.js (100%) rename packages/theme-base/{src => dist}/layouts/default.vue (100%) rename packages/theme-base/{src => dist}/locales/de-DE.json (100%) rename packages/theme-base/{src => dist}/locales/en-GB.json (100%) rename packages/theme-base/{src => dist}/logic/useLocales.js (100%) rename packages/theme-base/{src => dist}/pages/_.vue (100%) rename packages/theme-base/{src => dist}/pages/_lang/_.vue (100%) rename packages/theme-base/{src => dist}/store/index.js (100%) diff --git a/.github/workflows/deploy-preview-storefrontcloud.yml b/.github/workflows/deploy-preview-storefrontcloud.yml index daf9b59a..2aaba74f 100644 --- a/.github/workflows/deploy-preview-storefrontcloud.yml +++ b/.github/workflows/deploy-preview-storefrontcloud.yml @@ -249,6 +249,49 @@ jobs: run: | yarn build shopware-6-client --ci + build-default-theme: + name: Build default-theme package + needs: init + runs-on: ubuntu-latest + outputs: + package-hash: ${{ steps.folder-hash-step-default-theme.outputs.hash }} + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Setup node + uses: actions/setup-node@v1 + with: + node-version: "12.x" + - name: Check hash for directory packages/default-theme + id: folder-hash-step-default-theme + run: | + HASH=$(git rev-parse HEAD:packages/default-theme) + echo "::set-output name=hash::$HASH" + echo "Hash is: $HASH" + - name: Cache default-theme build + id: step-cache-build + uses: actions/cache@v2 + env: + cache-name: test-cache-default-theme-build + with: + path: | + packages/default-theme/dist + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}-${{ steps.folder-hash-step-default-theme.outputs.hash }} + - name: Cache node_modules + if: steps.step-cache-build.outputs.cache-hit != 'true' + uses: actions/cache@v2 + env: + cache-name: cache-node-modules-test + with: + path: | + node_modules + packages/*/node_modules + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }} + - name: Build default-theme + if: steps.step-cache-build.outputs.cache-hit != 'true' + run: | + yarn build default-theme --ci + create-test-project: name: Create test project needs: @@ -258,6 +301,7 @@ jobs: build-helpers, build-nuxt-module, build-shopware-6-client, + build-default-theme, ] runs-on: ubuntu-latest steps: @@ -307,6 +351,14 @@ jobs: path: | packages/shopware-6-client/dist key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}-${{ needs.build-shopware-6-client.outputs.package-hash }} + - name: Cache default-theme build + uses: actions/cache@v2 + env: + cache-name: test-cache-default-theme-build + with: + path: | + packages/default-theme/dist + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}-${{ needs.build-default-theme.outputs.package-hash }} # Step to speed up project init - name: Cache node_modules uses: actions/cache@v2 diff --git a/.github/workflows/publish-canary.yml b/.github/workflows/publish-canary.yml index 48a2d9b4..950c0930 100644 --- a/.github/workflows/publish-canary.yml +++ b/.github/workflows/publish-canary.yml @@ -250,6 +250,49 @@ jobs: run: | yarn build shopware-6-client --release + build-default-theme: + name: Build default-theme package + needs: init + runs-on: ubuntu-latest + outputs: + package-hash: ${{ steps.folder-hash-step-default-theme.outputs.hash }} + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Setup node + uses: actions/setup-node@v1 + with: + node-version: "12.x" + - name: Check hash for directory packages/default-theme + id: folder-hash-step-default-theme + run: | + HASH=$(git rev-parse HEAD:packages/default-theme) + echo "::set-output name=hash::$HASH" + echo "Hash is: $HASH" + - name: Cache default-theme build + id: step-cache-build + uses: actions/cache@v2 + env: + cache-name: test-cache-default-theme-build + with: + path: | + packages/default-theme/dist + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}-${{ steps.folder-hash-step-default-theme.outputs.hash }} + - name: Cache node_modules + if: steps.step-cache-build.outputs.cache-hit != 'true' + uses: actions/cache@v2 + env: + cache-name: cache-node-modules-test + with: + path: | + node_modules + packages/*/node_modules + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }} + - name: Build default-theme + if: steps.step-cache-build.outputs.cache-hit != 'true' + run: | + yarn build default-theme --release + publish: name: Publish version runs-on: ubuntu-latest @@ -260,6 +303,7 @@ jobs: build-helpers, build-nuxt-module, build-shopware-6-client, + build-default-theme, ] steps: - name: Checkout code @@ -311,6 +355,14 @@ jobs: path: | packages/shopware-6-client/dist key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}-${{ needs.build-shopware-6-client.outputs.package-hash }} + - name: Cache defaut-theme build + uses: actions/cache@v2 + env: + cache-name: test-cache-defaut-theme-build + with: + path: | + packages/defaut-theme/dist + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}-${{ needs.build-defaut-theme.outputs.package-hash }} - name: Cache node_modules uses: actions/cache@v2 id: step-cache-node-modules diff --git a/package.json b/package.json index 2b6b25f4..d30f6e41 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "axios": "^0.20.0", "brotli": "^1.3.2", "chalk": "^4.1.0", - "chokidar": "^3.4.2", + "chokidar": "^3.4.3", "conventional-changelog-cli": "^2.1.0", "coveralls": "^3.1.0", "cypress": "^4.12.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 61a78522..3468c2e5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -30,7 +30,7 @@ "license": "MIT", "dependencies": { "@shopware-pwa/shopware-6-client": "0.4.2", - "chokidar": "^3.4.2", + "chokidar": "^3.4.3", "gluegun": "^4.4.0", "lodash": "^4.17.20", "md5-hex": "^3.0.1", diff --git a/packages/cli/src/commands/build-theme.ts b/packages/cli/src/commands/build-theme.ts index ff0a54dc..95b03692 100644 --- a/packages/cli/src/commands/build-theme.ts +++ b/packages/cli/src/commands/build-theme.ts @@ -4,7 +4,6 @@ const command: GluegunCommand = { name: "build-theme", description: "Build your theme for Shopware PWA projects.", run: async (toolbox) => { - const path = require("path"); const fse = require("fs-extra"); const buildingSpinner = toolbox.print.spin("Building theme..."); @@ -38,18 +37,9 @@ const command: GluegunCommand = { } } - await fse.copy("src", destinationDirectoryName); - await fse.copy( - "package.json", - path.join(destinationDirectoryName, "package.json") - ); - await toolbox.patching.update( - path.join("dist", "package.json"), - (config) => { - delete config.private; - return config; - } - ); + await toolbox.filesystem.copyAsync("src", destinationDirectoryName, { + overwrite: true, + }); buildingSpinner.succeed("Theme built!"); }, }; diff --git a/packages/cli/src/commands/create-theme.ts b/packages/cli/src/commands/create-theme.ts index bba8af43..8ed7791a 100644 --- a/packages/cli/src/commands/create-theme.ts +++ b/packages/cli/src/commands/create-theme.ts @@ -105,12 +105,11 @@ const command: GluegunCommand = { (config) => { config.baseTheme = baseThemePackageName; - config.private = true; config.scripts = config.scripts || {}; config.scripts.build = "shopware-pwa build-theme"; config.scripts.dev = "shopware-pwa dev-theme"; - config.scripts.postinstall = "yarn build && cd ./dist && yarn link"; - config.scripts.release = "yarn build && cd ./dist && yarn publish"; + + config.files = ["dist"]; delete config.main; return config; } diff --git a/packages/cli/src/commands/init.ts b/packages/cli/src/commands/init.ts index 70bb5691..4a894bed 100644 --- a/packages/cli/src/commands/init.ts +++ b/packages/cli/src/commands/init.ts @@ -69,6 +69,7 @@ module.exports = { "@shopware-pwa/shopware-6-client", "@shopware-pwa/default-theme", "@shopware-pwa/nuxt-module", + "@shopware-pwa/theme-base", ]; try { diff --git a/packages/cli/src/extensions/shopware-pwa-extension.ts b/packages/cli/src/extensions/shopware-pwa-extension.ts index e69f9596..afb76d0f 100644 --- a/packages/cli/src/extensions/shopware-pwa-extension.ts +++ b/packages/cli/src/extensions/shopware-pwa-extension.ts @@ -25,10 +25,20 @@ module.exports = (toolbox: GluegunToolbox) => { toolbox.getThemePath = (themeName = toolbox.config.theme) => { const path = require("path"); + const directDistPath = path.join(themeName, "dist"); + const directDistPathExist = require("fs").existsSync(directDistPath); + if (directDistPathExist) return directDistPath; + const directPath = themeName; const directPathExist = require("fs").existsSync(directPath); if (directPathExist) return directPath; + const nodePackageDistPath = path.join("node_modules", themeName, "dist"); + const nodePackageDistPathExist = require("fs").existsSync( + nodePackageDistPath + ); + if (nodePackageDistPathExist) return nodePackageDistPath; + const nodePackagePath = path.join("node_modules", themeName); const nodePackagePathExist = require("fs").existsSync(nodePackagePath); if (nodePackagePathExist) return nodePackagePath; diff --git a/packages/default-theme/.gitignore b/packages/default-theme/.gitignore index db6b863a..9e6d3e7d 100644 --- a/packages/default-theme/.gitignore +++ b/packages/default-theme/.gitignore @@ -1,93 +1,7 @@ -# Created by .ignore support plugin (hsz.mobi) -### Node template -# Logs -/logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# TypeScript v1 declaration files -typings/ - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# next.js build output -.next - -# nuxt.js build output -.nuxt - -# Nuxt generate +node_modules +node_modules_dev +lerna-debug.log dist - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless - -# IDE / Editor -.idea - -# Service worker -sw.* - -# Mac OSX .DS_Store - -# Vim swap files -*.swp - -cypress/screenshots -cypress/videos \ No newline at end of file +.yalc +yalc.lock \ No newline at end of file diff --git a/packages/default-theme/.npmignore b/packages/default-theme/.npmignore deleted file mode 100644 index 338ccf1c..00000000 --- a/packages/default-theme/.npmignore +++ /dev/null @@ -1,3 +0,0 @@ -.nuxt -coverage -node_modules \ No newline at end of file diff --git a/packages/default-theme/README.md b/packages/default-theme/README.md index 688556de..ad1592d2 100644 --- a/packages/default-theme/README.md +++ b/packages/default-theme/README.md @@ -1,6 +1,6 @@ # @shopware-pwa/default-theme -> Shopware PWA theme +> Shopware PWA default theme ## Build Setup diff --git a/packages/default-theme/app/router.scrollBehavior.js b/packages/default-theme/app/router.scrollBehavior.js deleted file mode 100644 index 2bad75b4..00000000 --- a/packages/default-theme/app/router.scrollBehavior.js +++ /dev/null @@ -1,7 +0,0 @@ -export default function (to, from, savedPosition) { - if (savedPosition) { - return savedPosition - } else { - return { x: 0, y: 0 } - } -} diff --git a/packages/default-theme/helpers/formatPrice.js b/packages/default-theme/helpers/formatPrice.js deleted file mode 100644 index 89fb9d2e..00000000 --- a/packages/default-theme/helpers/formatPrice.js +++ /dev/null @@ -1,20 +0,0 @@ -import currency from "currency.js" - -const defaultFormatPriceOptions = { - pattern: `# !`, - separator: ` `, - decimal: `,`, - symbol: `€`, - formatWithSymbol: true, -} - -export function formatPrice(price, options) { - if (typeof price !== "number") { - return - } - - return currency( - price, - Object.assign(defaultFormatPriceOptions, options) - ).format() -} diff --git a/packages/default-theme/logic/index.js b/packages/default-theme/logic/index.js deleted file mode 100644 index 332b62ec..00000000 --- a/packages/default-theme/logic/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from "./useLocales" diff --git a/packages/default-theme/logic/useLocales.js b/packages/default-theme/logic/useLocales.js deleted file mode 100644 index c5690b44..00000000 --- a/packages/default-theme/logic/useLocales.js +++ /dev/null @@ -1,28 +0,0 @@ -import { computed } from "@vue/composition-api" -import languagesMap from "sw-plugins/languages" -import { getApplicationContext } from "@shopware-pwa/composables" - -export const useLocales = (rootContext) => { - const { i18n, router } = getApplicationContext( - rootContext, - "useUICheckoutPage" - ) - - const availableLanguages = computed(() => Object.values(languagesMap) || []) - const currentLocale = computed(() => i18n.locale) - - const changeLocale = async (localeCode) => { - if (localeCode === i18n.locale) return - if (localeCode === i18n.fallbackLocale) { - router.push(rootContext.$route.fullPath.replace(/^\/[^\/]+/, "")) - } else { - router.push(`/${localeCode}${rootContext.$route.fullPath}`) - } - } - - return { - availableLanguages, - changeLocale, - currentLocale, - } -} diff --git a/packages/default-theme/package.json b/packages/default-theme/package.json index 56feb1e7..eab34116 100644 --- a/packages/default-theme/package.json +++ b/packages/default-theme/package.json @@ -2,8 +2,15 @@ "name": "@shopware-pwa/default-theme", "version": "0.4.2", "description": "Shopware PWA theme", - "author": "patzick", + "author": "patzick <13100280+patzick@users.noreply.github.com>", + "license": "MIT", + "baseTheme": "@shopware-pwa/theme-base", + "files": [ + "dist" + ], "scripts": { + "build": "shopware-pwa build-theme", + "dev": "shopware-pwa dev-theme", "lint": "prettier --write './**/*.{js,vue}'", "test": "jest" }, @@ -15,11 +22,9 @@ "lint-staged": { "*.{js,vue}": "prettier" }, - "license": "MIT", "dependencies": { "@storefront-ui/vue": "0.7.18", "core-js": "^3.6.5", - "currency.js": "^2.0.3", "dayjs": "^1.9.1", "html-to-vue": "^1.2.1", "node-sass": "^4.14.1", @@ -29,6 +34,8 @@ "vuelidate": "^0.7.5" }, "devDependencies": { + "@shopware-pwa/cli": "0.4.2", + "@shopware-pwa/theme-base": "0.4.2", "@babel/runtime-corejs3": "^7.11.2", "@nuxtjs/eslint-config": "^3.1.0", "@nuxtjs/eslint-module": "^3.0.0", @@ -45,8 +52,5 @@ "lint-staged": "^10.4.0", "prettier": "^2.1.2", "vue-jest": "^4.0.0-0" - }, - "publishConfig": { - "access": "public" } } diff --git a/packages/default-theme/sfui.scss b/packages/default-theme/sfui.scss deleted file mode 100644 index d303694e..00000000 --- a/packages/default-theme/sfui.scss +++ /dev/null @@ -1,6 +0,0 @@ -/* Here you can override global SCSS variables */ - -// global override excluding scoped components -// $button-padding: 5px !default; -// global override including scoped componentss -// $button-padding: 50px; \ No newline at end of file diff --git a/packages/default-theme/.babelrc b/packages/default-theme/src/.babelrc similarity index 100% rename from packages/default-theme/.babelrc rename to packages/default-theme/src/.babelrc diff --git a/packages/default-theme/.editorconfig b/packages/default-theme/src/.editorconfig similarity index 100% rename from packages/default-theme/.editorconfig rename to packages/default-theme/src/.editorconfig diff --git a/packages/default-theme/.eslintrc.js b/packages/default-theme/src/.eslintrc.js similarity index 100% rename from packages/default-theme/.eslintrc.js rename to packages/default-theme/src/.eslintrc.js diff --git a/packages/default-theme/.prettierrc b/packages/default-theme/src/.prettierrc similarity index 100% rename from packages/default-theme/.prettierrc rename to packages/default-theme/src/.prettierrc diff --git a/packages/default-theme/assets/error.svg b/packages/default-theme/src/assets/error.svg similarity index 100% rename from packages/default-theme/assets/error.svg rename to packages/default-theme/src/assets/error.svg diff --git a/packages/default-theme/assets/flag.png b/packages/default-theme/src/assets/flag.png similarity index 100% rename from packages/default-theme/assets/flag.png rename to packages/default-theme/src/assets/flag.png diff --git a/packages/default-theme/assets/productB.jpg b/packages/default-theme/src/assets/productB.jpg similarity index 100% rename from packages/default-theme/assets/productB.jpg rename to packages/default-theme/src/assets/productB.jpg diff --git a/packages/default-theme/assets/scss/forms.scss b/packages/default-theme/src/assets/scss/forms.scss similarity index 100% rename from packages/default-theme/assets/scss/forms.scss rename to packages/default-theme/src/assets/scss/forms.scss diff --git a/packages/default-theme/assets/scss/main.scss b/packages/default-theme/src/assets/scss/main.scss similarity index 100% rename from packages/default-theme/assets/scss/main.scss rename to packages/default-theme/src/assets/scss/main.scss diff --git a/packages/default-theme/assets/scss/variables.scss b/packages/default-theme/src/assets/scss/variables.scss similarity index 100% rename from packages/default-theme/assets/scss/variables.scss rename to packages/default-theme/src/assets/scss/variables.scss diff --git a/packages/default-theme/cms/CmsGenericBlock.vue b/packages/default-theme/src/cms/CmsGenericBlock.vue similarity index 100% rename from packages/default-theme/cms/CmsGenericBlock.vue rename to packages/default-theme/src/cms/CmsGenericBlock.vue diff --git a/packages/default-theme/cms/CmsGenericElement.vue b/packages/default-theme/src/cms/CmsGenericElement.vue similarity index 100% rename from packages/default-theme/cms/CmsGenericElement.vue rename to packages/default-theme/src/cms/CmsGenericElement.vue diff --git a/packages/default-theme/cms/CmsGenericSection.vue b/packages/default-theme/src/cms/CmsGenericSection.vue similarity index 100% rename from packages/default-theme/cms/CmsGenericSection.vue rename to packages/default-theme/src/cms/CmsGenericSection.vue diff --git a/packages/default-theme/cms/CmsNoComponent.vue b/packages/default-theme/src/cms/CmsNoComponent.vue similarity index 100% rename from packages/default-theme/cms/CmsNoComponent.vue rename to packages/default-theme/src/cms/CmsNoComponent.vue diff --git a/packages/default-theme/cms/CmsPage.vue b/packages/default-theme/src/cms/CmsPage.vue similarity index 100% rename from packages/default-theme/cms/CmsPage.vue rename to packages/default-theme/src/cms/CmsPage.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockCategoryNavigation.vue b/packages/default-theme/src/cms/blocks/CmsBlockCategoryNavigation.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockCategoryNavigation.vue rename to packages/default-theme/src/cms/blocks/CmsBlockCategoryNavigation.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockCenterText.vue b/packages/default-theme/src/cms/blocks/CmsBlockCenterText.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockCenterText.vue rename to packages/default-theme/src/cms/blocks/CmsBlockCenterText.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockDefault.vue b/packages/default-theme/src/cms/blocks/CmsBlockDefault.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockDefault.vue rename to packages/default-theme/src/cms/blocks/CmsBlockDefault.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockForms.vue b/packages/default-theme/src/cms/blocks/CmsBlockForms.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockForms.vue rename to packages/default-theme/src/cms/blocks/CmsBlockForms.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockImageBubbleRow.vue b/packages/default-theme/src/cms/blocks/CmsBlockImageBubbleRow.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockImageBubbleRow.vue rename to packages/default-theme/src/cms/blocks/CmsBlockImageBubbleRow.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockImageCover.vue b/packages/default-theme/src/cms/blocks/CmsBlockImageCover.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockImageCover.vue rename to packages/default-theme/src/cms/blocks/CmsBlockImageCover.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockImageFourColumn.vue b/packages/default-theme/src/cms/blocks/CmsBlockImageFourColumn.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockImageFourColumn.vue rename to packages/default-theme/src/cms/blocks/CmsBlockImageFourColumn.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockImageHighlightRow.vue b/packages/default-theme/src/cms/blocks/CmsBlockImageHighlightRow.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockImageHighlightRow.vue rename to packages/default-theme/src/cms/blocks/CmsBlockImageHighlightRow.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockImageSimpleGrid.vue b/packages/default-theme/src/cms/blocks/CmsBlockImageSimpleGrid.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockImageSimpleGrid.vue rename to packages/default-theme/src/cms/blocks/CmsBlockImageSimpleGrid.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockImageText.vue b/packages/default-theme/src/cms/blocks/CmsBlockImageText.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockImageText.vue rename to packages/default-theme/src/cms/blocks/CmsBlockImageText.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockImageTextCover.vue b/packages/default-theme/src/cms/blocks/CmsBlockImageTextCover.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockImageTextCover.vue rename to packages/default-theme/src/cms/blocks/CmsBlockImageTextCover.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockImageTextGallery.vue b/packages/default-theme/src/cms/blocks/CmsBlockImageTextGallery.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockImageTextGallery.vue rename to packages/default-theme/src/cms/blocks/CmsBlockImageTextGallery.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockImageThreeColumn.vue b/packages/default-theme/src/cms/blocks/CmsBlockImageThreeColumn.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockImageThreeColumn.vue rename to packages/default-theme/src/cms/blocks/CmsBlockImageThreeColumn.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockImageThreeCover.vue b/packages/default-theme/src/cms/blocks/CmsBlockImageThreeCover.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockImageThreeCover.vue rename to packages/default-theme/src/cms/blocks/CmsBlockImageThreeCover.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockImageTwoColumn.vue b/packages/default-theme/src/cms/blocks/CmsBlockImageTwoColumn.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockImageTwoColumn.vue rename to packages/default-theme/src/cms/blocks/CmsBlockImageTwoColumn.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockProductListing.vue b/packages/default-theme/src/cms/blocks/CmsBlockProductListing.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockProductListing.vue rename to packages/default-theme/src/cms/blocks/CmsBlockProductListing.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockProductThreeColumn.vue b/packages/default-theme/src/cms/blocks/CmsBlockProductThreeColumn.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockProductThreeColumn.vue rename to packages/default-theme/src/cms/blocks/CmsBlockProductThreeColumn.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockTextOnImage.vue b/packages/default-theme/src/cms/blocks/CmsBlockTextOnImage.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockTextOnImage.vue rename to packages/default-theme/src/cms/blocks/CmsBlockTextOnImage.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockTextThreeColumn.vue b/packages/default-theme/src/cms/blocks/CmsBlockTextThreeColumn.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockTextThreeColumn.vue rename to packages/default-theme/src/cms/blocks/CmsBlockTextThreeColumn.vue diff --git a/packages/default-theme/cms/blocks/CmsBlockTextTwoColumn.vue b/packages/default-theme/src/cms/blocks/CmsBlockTextTwoColumn.vue similarity index 100% rename from packages/default-theme/cms/blocks/CmsBlockTextTwoColumn.vue rename to packages/default-theme/src/cms/blocks/CmsBlockTextTwoColumn.vue diff --git a/packages/default-theme/cms/cmsMap.json b/packages/default-theme/src/cms/cmsMap.json similarity index 100% rename from packages/default-theme/cms/cmsMap.json rename to packages/default-theme/src/cms/cmsMap.json diff --git a/packages/default-theme/cms/elements/CmsElementCategoryNavigation.vue b/packages/default-theme/src/cms/elements/CmsElementCategoryNavigation.vue similarity index 100% rename from packages/default-theme/cms/elements/CmsElementCategoryNavigation.vue rename to packages/default-theme/src/cms/elements/CmsElementCategoryNavigation.vue diff --git a/packages/default-theme/cms/elements/CmsElementCategorySidebarFilter.vue b/packages/default-theme/src/cms/elements/CmsElementCategorySidebarFilter.vue similarity index 100% rename from packages/default-theme/cms/elements/CmsElementCategorySidebarFilter.vue rename to packages/default-theme/src/cms/elements/CmsElementCategorySidebarFilter.vue diff --git a/packages/default-theme/cms/elements/CmsElementContactForm.vue b/packages/default-theme/src/cms/elements/CmsElementContactForm.vue similarity index 100% rename from packages/default-theme/cms/elements/CmsElementContactForm.vue rename to packages/default-theme/src/cms/elements/CmsElementContactForm.vue diff --git a/packages/default-theme/cms/elements/CmsElementForm.vue b/packages/default-theme/src/cms/elements/CmsElementForm.vue similarity index 100% rename from packages/default-theme/cms/elements/CmsElementForm.vue rename to packages/default-theme/src/cms/elements/CmsElementForm.vue diff --git a/packages/default-theme/cms/elements/CmsElementImage.vue b/packages/default-theme/src/cms/elements/CmsElementImage.vue similarity index 100% rename from packages/default-theme/cms/elements/CmsElementImage.vue rename to packages/default-theme/src/cms/elements/CmsElementImage.vue diff --git a/packages/default-theme/cms/elements/CmsElementImageSlider.vue b/packages/default-theme/src/cms/elements/CmsElementImageSlider.vue similarity index 100% rename from packages/default-theme/cms/elements/CmsElementImageSlider.vue rename to packages/default-theme/src/cms/elements/CmsElementImageSlider.vue diff --git a/packages/default-theme/cms/elements/CmsElementNesletterForm.vue b/packages/default-theme/src/cms/elements/CmsElementNesletterForm.vue similarity index 100% rename from packages/default-theme/cms/elements/CmsElementNesletterForm.vue rename to packages/default-theme/src/cms/elements/CmsElementNesletterForm.vue diff --git a/packages/default-theme/cms/elements/CmsElementProductCard.vue b/packages/default-theme/src/cms/elements/CmsElementProductCard.vue similarity index 100% rename from packages/default-theme/cms/elements/CmsElementProductCard.vue rename to packages/default-theme/src/cms/elements/CmsElementProductCard.vue diff --git a/packages/default-theme/cms/elements/CmsElementProductListing.vue b/packages/default-theme/src/cms/elements/CmsElementProductListing.vue similarity index 100% rename from packages/default-theme/cms/elements/CmsElementProductListing.vue rename to packages/default-theme/src/cms/elements/CmsElementProductListing.vue diff --git a/packages/default-theme/cms/elements/CmsElementProductSlider.vue b/packages/default-theme/src/cms/elements/CmsElementProductSlider.vue similarity index 100% rename from packages/default-theme/cms/elements/CmsElementProductSlider.vue rename to packages/default-theme/src/cms/elements/CmsElementProductSlider.vue diff --git a/packages/default-theme/cms/elements/CmsElementText.vue b/packages/default-theme/src/cms/elements/CmsElementText.vue similarity index 100% rename from packages/default-theme/cms/elements/CmsElementText.vue rename to packages/default-theme/src/cms/elements/CmsElementText.vue diff --git a/packages/default-theme/cms/elements/CmsElementVideoVimeo.vue b/packages/default-theme/src/cms/elements/CmsElementVideoVimeo.vue similarity index 100% rename from packages/default-theme/cms/elements/CmsElementVideoVimeo.vue rename to packages/default-theme/src/cms/elements/CmsElementVideoVimeo.vue diff --git a/packages/default-theme/cms/elements/CmsElementVideoYoutube.vue b/packages/default-theme/src/cms/elements/CmsElementVideoYoutube.vue similarity index 100% rename from packages/default-theme/cms/elements/CmsElementVideoYoutube.vue rename to packages/default-theme/src/cms/elements/CmsElementVideoYoutube.vue diff --git a/packages/default-theme/cms/sections/CmsSectionDefault.vue b/packages/default-theme/src/cms/sections/CmsSectionDefault.vue similarity index 100% rename from packages/default-theme/cms/sections/CmsSectionDefault.vue rename to packages/default-theme/src/cms/sections/CmsSectionDefault.vue diff --git a/packages/default-theme/cms/sections/CmsSectionSidebar.vue b/packages/default-theme/src/cms/sections/CmsSectionSidebar.vue similarity index 100% rename from packages/default-theme/cms/sections/CmsSectionSidebar.vue rename to packages/default-theme/src/cms/sections/CmsSectionSidebar.vue diff --git a/packages/default-theme/cms/settings.scss b/packages/default-theme/src/cms/settings.scss similarity index 100% rename from packages/default-theme/cms/settings.scss rename to packages/default-theme/src/cms/settings.scss diff --git a/packages/default-theme/components/SwAddress.vue b/packages/default-theme/src/components/SwAddress.vue similarity index 100% rename from packages/default-theme/components/SwAddress.vue rename to packages/default-theme/src/components/SwAddress.vue diff --git a/packages/default-theme/components/SwAddressList.vue b/packages/default-theme/src/components/SwAddressList.vue similarity index 100% rename from packages/default-theme/components/SwAddressList.vue rename to packages/default-theme/src/components/SwAddressList.vue diff --git a/packages/default-theme/components/SwBottomMenu.vue b/packages/default-theme/src/components/SwBottomMenu.vue similarity index 100% rename from packages/default-theme/components/SwBottomMenu.vue rename to packages/default-theme/src/components/SwBottomMenu.vue diff --git a/packages/default-theme/components/SwBottomMoreActions.vue b/packages/default-theme/src/components/SwBottomMoreActions.vue similarity index 100% rename from packages/default-theme/components/SwBottomMoreActions.vue rename to packages/default-theme/src/components/SwBottomMoreActions.vue diff --git a/packages/default-theme/components/SwBottomNavigation.vue b/packages/default-theme/src/components/SwBottomNavigation.vue similarity index 100% rename from packages/default-theme/components/SwBottomNavigation.vue rename to packages/default-theme/src/components/SwBottomNavigation.vue diff --git a/packages/default-theme/components/SwCart.vue b/packages/default-theme/src/components/SwCart.vue similarity index 100% rename from packages/default-theme/components/SwCart.vue rename to packages/default-theme/src/components/SwCart.vue diff --git a/packages/default-theme/components/SwCartProduct.vue b/packages/default-theme/src/components/SwCartProduct.vue similarity index 100% rename from packages/default-theme/components/SwCartProduct.vue rename to packages/default-theme/src/components/SwCartProduct.vue diff --git a/packages/default-theme/components/SwCheckoutMethod.vue b/packages/default-theme/src/components/SwCheckoutMethod.vue similarity index 100% rename from packages/default-theme/components/SwCheckoutMethod.vue rename to packages/default-theme/src/components/SwCheckoutMethod.vue diff --git a/packages/default-theme/components/SwCurrencySwitcher.vue b/packages/default-theme/src/components/SwCurrencySwitcher.vue similarity index 100% rename from packages/default-theme/components/SwCurrencySwitcher.vue rename to packages/default-theme/src/components/SwCurrencySwitcher.vue diff --git a/packages/default-theme/components/SwErrorsList.vue b/packages/default-theme/src/components/SwErrorsList.vue similarity index 100% rename from packages/default-theme/components/SwErrorsList.vue rename to packages/default-theme/src/components/SwErrorsList.vue diff --git a/packages/default-theme/components/SwFooter.vue b/packages/default-theme/src/components/SwFooter.vue similarity index 100% rename from packages/default-theme/components/SwFooter.vue rename to packages/default-theme/src/components/SwFooter.vue diff --git a/packages/default-theme/components/SwHeader.vue b/packages/default-theme/src/components/SwHeader.vue similarity index 100% rename from packages/default-theme/components/SwHeader.vue rename to packages/default-theme/src/components/SwHeader.vue diff --git a/packages/default-theme/components/SwHeaderIcons.vue b/packages/default-theme/src/components/SwHeaderIcons.vue similarity index 100% rename from packages/default-theme/components/SwHeaderIcons.vue rename to packages/default-theme/src/components/SwHeaderIcons.vue diff --git a/packages/default-theme/components/SwLanguageSwitcher.vue b/packages/default-theme/src/components/SwLanguageSwitcher.vue similarity index 100% rename from packages/default-theme/components/SwLanguageSwitcher.vue rename to packages/default-theme/src/components/SwLanguageSwitcher.vue diff --git a/packages/default-theme/components/SwLogin.vue b/packages/default-theme/src/components/SwLogin.vue similarity index 100% rename from packages/default-theme/components/SwLogin.vue rename to packages/default-theme/src/components/SwLogin.vue diff --git a/packages/default-theme/components/SwLogo.vue b/packages/default-theme/src/components/SwLogo.vue similarity index 100% rename from packages/default-theme/components/SwLogo.vue rename to packages/default-theme/src/components/SwLogo.vue diff --git a/packages/default-theme/components/SwMegaMenu.vue b/packages/default-theme/src/components/SwMegaMenu.vue similarity index 100% rename from packages/default-theme/components/SwMegaMenu.vue rename to packages/default-theme/src/components/SwMegaMenu.vue diff --git a/packages/default-theme/components/SwNotifications.vue b/packages/default-theme/src/components/SwNotifications.vue similarity index 100% rename from packages/default-theme/components/SwNotifications.vue rename to packages/default-theme/src/components/SwNotifications.vue diff --git a/packages/default-theme/components/SwOfflineMode.vue b/packages/default-theme/src/components/SwOfflineMode.vue similarity index 100% rename from packages/default-theme/components/SwOfflineMode.vue rename to packages/default-theme/src/components/SwOfflineMode.vue diff --git a/packages/default-theme/components/SwOrderDetails.vue b/packages/default-theme/src/components/SwOrderDetails.vue similarity index 100% rename from packages/default-theme/components/SwOrderDetails.vue rename to packages/default-theme/src/components/SwOrderDetails.vue diff --git a/packages/default-theme/components/SwOrderDetailsItem.vue b/packages/default-theme/src/components/SwOrderDetailsItem.vue similarity index 100% rename from packages/default-theme/components/SwOrderDetailsItem.vue rename to packages/default-theme/src/components/SwOrderDetailsItem.vue diff --git a/packages/default-theme/components/SwPersonalDetails.vue b/packages/default-theme/src/components/SwPersonalDetails.vue similarity index 100% rename from packages/default-theme/components/SwPersonalDetails.vue rename to packages/default-theme/src/components/SwPersonalDetails.vue diff --git a/packages/default-theme/components/SwProductAdvertisement.vue b/packages/default-theme/src/components/SwProductAdvertisement.vue similarity index 100% rename from packages/default-theme/components/SwProductAdvertisement.vue rename to packages/default-theme/src/components/SwProductAdvertisement.vue diff --git a/packages/default-theme/components/SwProductCard.vue b/packages/default-theme/src/components/SwProductCard.vue similarity index 100% rename from packages/default-theme/components/SwProductCard.vue rename to packages/default-theme/src/components/SwProductCard.vue diff --git a/packages/default-theme/components/SwProductCardHorizontal.vue b/packages/default-theme/src/components/SwProductCardHorizontal.vue similarity index 100% rename from packages/default-theme/components/SwProductCardHorizontal.vue rename to packages/default-theme/src/components/SwProductCardHorizontal.vue diff --git a/packages/default-theme/components/SwProductCarousel.vue b/packages/default-theme/src/components/SwProductCarousel.vue similarity index 100% rename from packages/default-theme/components/SwProductCarousel.vue rename to packages/default-theme/src/components/SwProductCarousel.vue diff --git a/packages/default-theme/components/SwProductColors.vue b/packages/default-theme/src/components/SwProductColors.vue similarity index 100% rename from packages/default-theme/components/SwProductColors.vue rename to packages/default-theme/src/components/SwProductColors.vue diff --git a/packages/default-theme/components/SwProductDetails.vue b/packages/default-theme/src/components/SwProductDetails.vue similarity index 100% rename from packages/default-theme/components/SwProductDetails.vue rename to packages/default-theme/src/components/SwProductDetails.vue diff --git a/packages/default-theme/components/SwProductGallery.vue b/packages/default-theme/src/components/SwProductGallery.vue similarity index 100% rename from packages/default-theme/components/SwProductGallery.vue rename to packages/default-theme/src/components/SwProductGallery.vue diff --git a/packages/default-theme/components/SwProductHeading.vue b/packages/default-theme/src/components/SwProductHeading.vue similarity index 100% rename from packages/default-theme/components/SwProductHeading.vue rename to packages/default-theme/src/components/SwProductHeading.vue diff --git a/packages/default-theme/components/SwProductListing.vue b/packages/default-theme/src/components/SwProductListing.vue similarity index 100% rename from packages/default-theme/components/SwProductListing.vue rename to packages/default-theme/src/components/SwProductListing.vue diff --git a/packages/default-theme/components/SwProductListingFilters.vue b/packages/default-theme/src/components/SwProductListingFilters.vue similarity index 100% rename from packages/default-theme/components/SwProductListingFilters.vue rename to packages/default-theme/src/components/SwProductListingFilters.vue diff --git a/packages/default-theme/components/SwProductSelect.vue b/packages/default-theme/src/components/SwProductSelect.vue similarity index 100% rename from packages/default-theme/components/SwProductSelect.vue rename to packages/default-theme/src/components/SwProductSelect.vue diff --git a/packages/default-theme/components/SwProductTabs.vue b/packages/default-theme/src/components/SwProductTabs.vue similarity index 100% rename from packages/default-theme/components/SwProductTabs.vue rename to packages/default-theme/src/components/SwProductTabs.vue diff --git a/packages/default-theme/components/SwPromoCode.vue b/packages/default-theme/src/components/SwPromoCode.vue similarity index 100% rename from packages/default-theme/components/SwPromoCode.vue rename to packages/default-theme/src/components/SwPromoCode.vue diff --git a/packages/default-theme/components/SwPromoCodeItem.vue b/packages/default-theme/src/components/SwPromoCodeItem.vue similarity index 100% rename from packages/default-theme/components/SwPromoCodeItem.vue rename to packages/default-theme/src/components/SwPromoCodeItem.vue diff --git a/packages/default-theme/components/SwRegister.vue b/packages/default-theme/src/components/SwRegister.vue similarity index 100% rename from packages/default-theme/components/SwRegister.vue rename to packages/default-theme/src/components/SwRegister.vue diff --git a/packages/default-theme/components/SwResetPassword.vue b/packages/default-theme/src/components/SwResetPassword.vue similarity index 100% rename from packages/default-theme/components/SwResetPassword.vue rename to packages/default-theme/src/components/SwResetPassword.vue diff --git a/packages/default-theme/components/SwSearchBar.vue b/packages/default-theme/src/components/SwSearchBar.vue similarity index 100% rename from packages/default-theme/components/SwSearchBar.vue rename to packages/default-theme/src/components/SwSearchBar.vue diff --git a/packages/default-theme/components/SwSuggestSearch.vue b/packages/default-theme/src/components/SwSuggestSearch.vue similarity index 100% rename from packages/default-theme/components/SwSuggestSearch.vue rename to packages/default-theme/src/components/SwSuggestSearch.vue diff --git a/packages/default-theme/components/SwTierPrices.vue b/packages/default-theme/src/components/SwTierPrices.vue similarity index 100% rename from packages/default-theme/components/SwTierPrices.vue rename to packages/default-theme/src/components/SwTierPrices.vue diff --git a/packages/default-theme/components/SwTopBar.vue b/packages/default-theme/src/components/SwTopBar.vue similarity index 100% rename from packages/default-theme/components/SwTopBar.vue rename to packages/default-theme/src/components/SwTopBar.vue diff --git a/packages/default-theme/components/SwTopNavigation.vue b/packages/default-theme/src/components/SwTopNavigation.vue similarity index 100% rename from packages/default-theme/components/SwTopNavigation.vue rename to packages/default-theme/src/components/SwTopNavigation.vue diff --git a/packages/default-theme/components/SwTopNavigationShowMore.vue b/packages/default-theme/src/components/SwTopNavigationShowMore.vue similarity index 100% rename from packages/default-theme/components/SwTopNavigationShowMore.vue rename to packages/default-theme/src/components/SwTopNavigationShowMore.vue diff --git a/packages/default-theme/components/SwTotals.vue b/packages/default-theme/src/components/SwTotals.vue similarity index 100% rename from packages/default-theme/components/SwTotals.vue rename to packages/default-theme/src/components/SwTotals.vue diff --git a/packages/default-theme/components/account/MyAddresses/Address.vue b/packages/default-theme/src/components/account/MyAddresses/Address.vue similarity index 100% rename from packages/default-theme/components/account/MyAddresses/Address.vue rename to packages/default-theme/src/components/account/MyAddresses/Address.vue diff --git a/packages/default-theme/components/account/orders/Order.vue b/packages/default-theme/src/components/account/orders/Order.vue similarity index 100% rename from packages/default-theme/components/account/orders/Order.vue rename to packages/default-theme/src/components/account/orders/Order.vue diff --git a/packages/default-theme/components/atoms/SwAlert.vue b/packages/default-theme/src/components/atoms/SwAlert.vue similarity index 100% rename from packages/default-theme/components/atoms/SwAlert.vue rename to packages/default-theme/src/components/atoms/SwAlert.vue diff --git a/packages/default-theme/components/atoms/SwButton.vue b/packages/default-theme/src/components/atoms/SwButton.vue similarity index 100% rename from packages/default-theme/components/atoms/SwButton.vue rename to packages/default-theme/src/components/atoms/SwButton.vue diff --git a/packages/default-theme/components/atoms/SwGoBackArrow.vue b/packages/default-theme/src/components/atoms/SwGoBackArrow.vue similarity index 100% rename from packages/default-theme/components/atoms/SwGoBackArrow.vue rename to packages/default-theme/src/components/atoms/SwGoBackArrow.vue diff --git a/packages/default-theme/components/atoms/SwImage.vue b/packages/default-theme/src/components/atoms/SwImage.vue similarity index 100% rename from packages/default-theme/components/atoms/SwImage.vue rename to packages/default-theme/src/components/atoms/SwImage.vue diff --git a/packages/default-theme/components/atoms/SwInput.vue b/packages/default-theme/src/components/atoms/SwInput.vue similarity index 100% rename from packages/default-theme/components/atoms/SwInput.vue rename to packages/default-theme/src/components/atoms/SwInput.vue diff --git a/packages/default-theme/components/atoms/SwLink.vue b/packages/default-theme/src/components/atoms/SwLink.vue similarity index 100% rename from packages/default-theme/components/atoms/SwLink.vue rename to packages/default-theme/src/components/atoms/SwLink.vue diff --git a/packages/default-theme/components/atoms/SwRating.vue b/packages/default-theme/src/components/atoms/SwRating.vue similarity index 100% rename from packages/default-theme/components/atoms/SwRating.vue rename to packages/default-theme/src/components/atoms/SwRating.vue diff --git a/packages/default-theme/components/checkout/sidebar/SidebarOrderReview.vue b/packages/default-theme/src/components/checkout/sidebar/SidebarOrderReview.vue similarity index 100% rename from packages/default-theme/components/checkout/sidebar/SidebarOrderReview.vue rename to packages/default-theme/src/components/checkout/sidebar/SidebarOrderReview.vue diff --git a/packages/default-theme/components/checkout/sidebar/SidebarOrderSummary.vue b/packages/default-theme/src/components/checkout/sidebar/SidebarOrderSummary.vue similarity index 100% rename from packages/default-theme/components/checkout/sidebar/SidebarOrderSummary.vue rename to packages/default-theme/src/components/checkout/sidebar/SidebarOrderSummary.vue diff --git a/packages/default-theme/components/checkout/steps/OrderReviewStep.vue b/packages/default-theme/src/components/checkout/steps/OrderReviewStep.vue similarity index 100% rename from packages/default-theme/components/checkout/steps/OrderReviewStep.vue rename to packages/default-theme/src/components/checkout/steps/OrderReviewStep.vue diff --git a/packages/default-theme/components/checkout/steps/PaymentStep.vue b/packages/default-theme/src/components/checkout/steps/PaymentStep.vue similarity index 100% rename from packages/default-theme/components/checkout/steps/PaymentStep.vue rename to packages/default-theme/src/components/checkout/steps/PaymentStep.vue diff --git a/packages/default-theme/components/checkout/steps/PersonalDetailsStep.vue b/packages/default-theme/src/components/checkout/steps/PersonalDetailsStep.vue similarity index 100% rename from packages/default-theme/components/checkout/steps/PersonalDetailsStep.vue rename to packages/default-theme/src/components/checkout/steps/PersonalDetailsStep.vue diff --git a/packages/default-theme/components/checkout/steps/ShippingStep.vue b/packages/default-theme/src/components/checkout/steps/ShippingStep.vue similarity index 100% rename from packages/default-theme/components/checkout/steps/ShippingStep.vue rename to packages/default-theme/src/components/checkout/steps/ShippingStep.vue diff --git a/packages/default-theme/components/checkout/steps/guest/BillingAddressGuestForm.vue b/packages/default-theme/src/components/checkout/steps/guest/BillingAddressGuestForm.vue similarity index 100% rename from packages/default-theme/components/checkout/steps/guest/BillingAddressGuestForm.vue rename to packages/default-theme/src/components/checkout/steps/guest/BillingAddressGuestForm.vue diff --git a/packages/default-theme/components/checkout/steps/guest/PersonalDetailsGuestForm.vue b/packages/default-theme/src/components/checkout/steps/guest/PersonalDetailsGuestForm.vue similarity index 100% rename from packages/default-theme/components/checkout/steps/guest/PersonalDetailsGuestForm.vue rename to packages/default-theme/src/components/checkout/steps/guest/PersonalDetailsGuestForm.vue diff --git a/packages/default-theme/components/checkout/steps/guest/ShippingAddressGuestForm.vue b/packages/default-theme/src/components/checkout/steps/guest/ShippingAddressGuestForm.vue similarity index 100% rename from packages/default-theme/components/checkout/steps/guest/ShippingAddressGuestForm.vue rename to packages/default-theme/src/components/checkout/steps/guest/ShippingAddressGuestForm.vue diff --git a/packages/default-theme/components/checkout/steps/user/BillingAddressUserForm.vue b/packages/default-theme/src/components/checkout/steps/user/BillingAddressUserForm.vue similarity index 100% rename from packages/default-theme/components/checkout/steps/user/BillingAddressUserForm.vue rename to packages/default-theme/src/components/checkout/steps/user/BillingAddressUserForm.vue diff --git a/packages/default-theme/components/checkout/steps/user/PersonalDetailsUserForm.vue b/packages/default-theme/src/components/checkout/steps/user/PersonalDetailsUserForm.vue similarity index 100% rename from packages/default-theme/components/checkout/steps/user/PersonalDetailsUserForm.vue rename to packages/default-theme/src/components/checkout/steps/user/PersonalDetailsUserForm.vue diff --git a/packages/default-theme/components/checkout/steps/user/ShippingAddressUserForm.vue b/packages/default-theme/src/components/checkout/steps/user/ShippingAddressUserForm.vue similarity index 100% rename from packages/default-theme/components/checkout/steps/user/ShippingAddressUserForm.vue rename to packages/default-theme/src/components/checkout/steps/user/ShippingAddressUserForm.vue diff --git a/packages/default-theme/components/checkout/summary/BillingAddressSummary.vue b/packages/default-theme/src/components/checkout/summary/BillingAddressSummary.vue similarity index 100% rename from packages/default-theme/components/checkout/summary/BillingAddressSummary.vue rename to packages/default-theme/src/components/checkout/summary/BillingAddressSummary.vue diff --git a/packages/default-theme/components/checkout/summary/OrderItem.vue b/packages/default-theme/src/components/checkout/summary/OrderItem.vue similarity index 100% rename from packages/default-theme/components/checkout/summary/OrderItem.vue rename to packages/default-theme/src/components/checkout/summary/OrderItem.vue diff --git a/packages/default-theme/components/checkout/summary/OrderItemsTable.vue b/packages/default-theme/src/components/checkout/summary/OrderItemsTable.vue similarity index 100% rename from packages/default-theme/components/checkout/summary/OrderItemsTable.vue rename to packages/default-theme/src/components/checkout/summary/OrderItemsTable.vue diff --git a/packages/default-theme/components/checkout/summary/PaymentMethodSummary.vue b/packages/default-theme/src/components/checkout/summary/PaymentMethodSummary.vue similarity index 100% rename from packages/default-theme/components/checkout/summary/PaymentMethodSummary.vue rename to packages/default-theme/src/components/checkout/summary/PaymentMethodSummary.vue diff --git a/packages/default-theme/components/checkout/summary/PersonalDetailsSummary.vue b/packages/default-theme/src/components/checkout/summary/PersonalDetailsSummary.vue similarity index 100% rename from packages/default-theme/components/checkout/summary/PersonalDetailsSummary.vue rename to packages/default-theme/src/components/checkout/summary/PersonalDetailsSummary.vue diff --git a/packages/default-theme/components/checkout/summary/ShippingAddressSummary.vue b/packages/default-theme/src/components/checkout/summary/ShippingAddressSummary.vue similarity index 100% rename from packages/default-theme/components/checkout/summary/ShippingAddressSummary.vue rename to packages/default-theme/src/components/checkout/summary/ShippingAddressSummary.vue diff --git a/packages/default-theme/components/checkout/summary/TotalsSummary.vue b/packages/default-theme/src/components/checkout/summary/TotalsSummary.vue similarity index 100% rename from packages/default-theme/components/checkout/summary/TotalsSummary.vue rename to packages/default-theme/src/components/checkout/summary/TotalsSummary.vue diff --git a/packages/default-theme/components/forms/SwAddressForm.vue b/packages/default-theme/src/components/forms/SwAddressForm.vue similarity index 100% rename from packages/default-theme/components/forms/SwAddressForm.vue rename to packages/default-theme/src/components/forms/SwAddressForm.vue diff --git a/packages/default-theme/components/forms/SwPassword.vue b/packages/default-theme/src/components/forms/SwPassword.vue similarity index 100% rename from packages/default-theme/components/forms/SwPassword.vue rename to packages/default-theme/src/components/forms/SwPassword.vue diff --git a/packages/default-theme/components/forms/SwPersonalInfo.vue b/packages/default-theme/src/components/forms/SwPersonalInfo.vue similarity index 100% rename from packages/default-theme/components/forms/SwPersonalInfo.vue rename to packages/default-theme/src/components/forms/SwPersonalInfo.vue diff --git a/packages/default-theme/components/gdpr/SwCookieBar.vue b/packages/default-theme/src/components/gdpr/SwCookieBar.vue similarity index 100% rename from packages/default-theme/components/gdpr/SwCookieBar.vue rename to packages/default-theme/src/components/gdpr/SwCookieBar.vue diff --git a/packages/default-theme/components/gdpr/SwCookieBarContent.vue b/packages/default-theme/src/components/gdpr/SwCookieBarContent.vue similarity index 100% rename from packages/default-theme/components/gdpr/SwCookieBarContent.vue rename to packages/default-theme/src/components/gdpr/SwCookieBarContent.vue diff --git a/packages/default-theme/components/listing/NoFilterFound.vue b/packages/default-theme/src/components/listing/NoFilterFound.vue similarity index 100% rename from packages/default-theme/components/listing/NoFilterFound.vue rename to packages/default-theme/src/components/listing/NoFilterFound.vue diff --git a/packages/default-theme/components/listing/SwProductListingFilter.vue b/packages/default-theme/src/components/listing/SwProductListingFilter.vue similarity index 100% rename from packages/default-theme/components/listing/SwProductListingFilter.vue rename to packages/default-theme/src/components/listing/SwProductListingFilter.vue diff --git a/packages/default-theme/components/listing/types/color.vue b/packages/default-theme/src/components/listing/types/color.vue similarity index 100% rename from packages/default-theme/components/listing/types/color.vue rename to packages/default-theme/src/components/listing/types/color.vue diff --git a/packages/default-theme/components/listing/types/content.vue b/packages/default-theme/src/components/listing/types/content.vue similarity index 100% rename from packages/default-theme/components/listing/types/content.vue rename to packages/default-theme/src/components/listing/types/content.vue diff --git a/packages/default-theme/components/listing/types/entity.vue b/packages/default-theme/src/components/listing/types/entity.vue similarity index 100% rename from packages/default-theme/components/listing/types/entity.vue rename to packages/default-theme/src/components/listing/types/entity.vue diff --git a/packages/default-theme/components/listing/types/fabric.vue b/packages/default-theme/src/components/listing/types/fabric.vue similarity index 100% rename from packages/default-theme/components/listing/types/fabric.vue rename to packages/default-theme/src/components/listing/types/fabric.vue diff --git a/packages/default-theme/components/listing/types/length.vue b/packages/default-theme/src/components/listing/types/length.vue similarity index 100% rename from packages/default-theme/components/listing/types/length.vue rename to packages/default-theme/src/components/listing/types/length.vue diff --git a/packages/default-theme/components/listing/types/manufacturer.vue b/packages/default-theme/src/components/listing/types/manufacturer.vue similarity index 100% rename from packages/default-theme/components/listing/types/manufacturer.vue rename to packages/default-theme/src/components/listing/types/manufacturer.vue diff --git a/packages/default-theme/components/listing/types/max.vue b/packages/default-theme/src/components/listing/types/max.vue similarity index 100% rename from packages/default-theme/components/listing/types/max.vue rename to packages/default-theme/src/components/listing/types/max.vue diff --git a/packages/default-theme/components/listing/types/price.vue b/packages/default-theme/src/components/listing/types/price.vue similarity index 100% rename from packages/default-theme/components/listing/types/price.vue rename to packages/default-theme/src/components/listing/types/price.vue diff --git a/packages/default-theme/components/listing/types/range.vue b/packages/default-theme/src/components/listing/types/range.vue similarity index 100% rename from packages/default-theme/components/listing/types/range.vue rename to packages/default-theme/src/components/listing/types/range.vue diff --git a/packages/default-theme/components/listing/types/rating.vue b/packages/default-theme/src/components/listing/types/rating.vue similarity index 100% rename from packages/default-theme/components/listing/types/rating.vue rename to packages/default-theme/src/components/listing/types/rating.vue diff --git a/packages/default-theme/components/listing/types/shipping-free.vue b/packages/default-theme/src/components/listing/types/shipping-free.vue similarity index 100% rename from packages/default-theme/components/listing/types/shipping-free.vue rename to packages/default-theme/src/components/listing/types/shipping-free.vue diff --git a/packages/default-theme/components/listing/types/size.vue b/packages/default-theme/src/components/listing/types/size.vue similarity index 100% rename from packages/default-theme/components/listing/types/size.vue rename to packages/default-theme/src/components/listing/types/size.vue diff --git a/packages/default-theme/components/listing/types/textile.vue b/packages/default-theme/src/components/listing/types/textile.vue similarity index 100% rename from packages/default-theme/components/listing/types/textile.vue rename to packages/default-theme/src/components/listing/types/textile.vue diff --git a/packages/default-theme/components/listing/types/tone.vue b/packages/default-theme/src/components/listing/types/tone.vue similarity index 100% rename from packages/default-theme/components/listing/types/tone.vue rename to packages/default-theme/src/components/listing/types/tone.vue diff --git a/packages/default-theme/components/listing/types/width.vue b/packages/default-theme/src/components/listing/types/width.vue similarity index 100% rename from packages/default-theme/components/listing/types/width.vue rename to packages/default-theme/src/components/listing/types/width.vue diff --git a/packages/default-theme/components/modals/SwLoginModal.vue b/packages/default-theme/src/components/modals/SwLoginModal.vue similarity index 100% rename from packages/default-theme/components/modals/SwLoginModal.vue rename to packages/default-theme/src/components/modals/SwLoginModal.vue diff --git a/packages/default-theme/components/organisms/SwFooterNavigation.vue b/packages/default-theme/src/components/organisms/SwFooterNavigation.vue similarity index 100% rename from packages/default-theme/components/organisms/SwFooterNavigation.vue rename to packages/default-theme/src/components/organisms/SwFooterNavigation.vue diff --git a/packages/default-theme/components/views/CategoryView.vue b/packages/default-theme/src/components/views/CategoryView.vue similarity index 100% rename from packages/default-theme/components/views/CategoryView.vue rename to packages/default-theme/src/components/views/CategoryView.vue diff --git a/packages/default-theme/components/views/ProductView.vue b/packages/default-theme/src/components/views/ProductView.vue similarity index 100% rename from packages/default-theme/components/views/ProductView.vue rename to packages/default-theme/src/components/views/ProductView.vue diff --git a/packages/default-theme/helpers/index.js b/packages/default-theme/src/helpers/index.js similarity index 89% rename from packages/default-theme/helpers/index.js rename to packages/default-theme/src/helpers/index.js index 62788fe9..bd2ec3ca 100644 --- a/packages/default-theme/helpers/index.js +++ b/packages/default-theme/src/helpers/index.js @@ -1,5 +1,4 @@ import dayjs from "dayjs" -import currency from "currency.js" import { PAGE_SEARCH } from "./pages" const defaultFormatPriceOptions = { @@ -10,7 +9,7 @@ const defaultFormatPriceOptions = { formatWithSymbol: true, } -export { formatPrice } from "./formatPrice" +export { formatPrice } from "@/helpers/formatPrice" export const getSortingLabel = (sorting) => { if (!sorting || !sorting.field) { diff --git a/packages/default-theme/helpers/pages.js b/packages/default-theme/src/helpers/pages.js similarity index 100% rename from packages/default-theme/helpers/pages.js rename to packages/default-theme/src/helpers/pages.js diff --git a/packages/default-theme/layouts/default.vue b/packages/default-theme/src/layouts/default.vue similarity index 100% rename from packages/default-theme/layouts/default.vue rename to packages/default-theme/src/layouts/default.vue diff --git a/packages/default-theme/layouts/error.vue b/packages/default-theme/src/layouts/error.vue similarity index 100% rename from packages/default-theme/layouts/error.vue rename to packages/default-theme/src/layouts/error.vue diff --git a/packages/default-theme/locales/de-DE.json b/packages/default-theme/src/locales/de-DE.json similarity index 100% rename from packages/default-theme/locales/de-DE.json rename to packages/default-theme/src/locales/de-DE.json diff --git a/packages/default-theme/locales/en-GB.json b/packages/default-theme/src/locales/en-GB.json similarity index 100% rename from packages/default-theme/locales/en-GB.json rename to packages/default-theme/src/locales/en-GB.json diff --git a/packages/default-theme/logic/checkout/helpers.js b/packages/default-theme/src/logic/checkout/helpers.js similarity index 100% rename from packages/default-theme/logic/checkout/helpers.js rename to packages/default-theme/src/logic/checkout/helpers.js diff --git a/packages/default-theme/logic/checkout/index.js b/packages/default-theme/src/logic/checkout/index.js similarity index 100% rename from packages/default-theme/logic/checkout/index.js rename to packages/default-theme/src/logic/checkout/index.js diff --git a/packages/default-theme/logic/checkout/steps.js b/packages/default-theme/src/logic/checkout/steps.js similarity index 100% rename from packages/default-theme/logic/checkout/steps.js rename to packages/default-theme/src/logic/checkout/steps.js diff --git a/packages/default-theme/logic/checkout/usePaymentStep.js b/packages/default-theme/src/logic/checkout/usePaymentStep.js similarity index 100% rename from packages/default-theme/logic/checkout/usePaymentStep.js rename to packages/default-theme/src/logic/checkout/usePaymentStep.js diff --git a/packages/default-theme/logic/checkout/usePersonalDetailsStep.js b/packages/default-theme/src/logic/checkout/usePersonalDetailsStep.js similarity index 100% rename from packages/default-theme/logic/checkout/usePersonalDetailsStep.js rename to packages/default-theme/src/logic/checkout/usePersonalDetailsStep.js diff --git a/packages/default-theme/logic/checkout/useShippingStep.js b/packages/default-theme/src/logic/checkout/useShippingStep.js similarity index 100% rename from packages/default-theme/logic/checkout/useShippingStep.js rename to packages/default-theme/src/logic/checkout/useShippingStep.js diff --git a/packages/default-theme/logic/checkout/useUICheckoutPage.js b/packages/default-theme/src/logic/checkout/useUICheckoutPage.js similarity index 100% rename from packages/default-theme/logic/checkout/useUICheckoutPage.js rename to packages/default-theme/src/logic/checkout/useUICheckoutPage.js diff --git a/packages/default-theme/src/logic/index.js b/packages/default-theme/src/logic/index.js new file mode 100644 index 00000000..e444b7b1 --- /dev/null +++ b/packages/default-theme/src/logic/index.js @@ -0,0 +1 @@ +export * from "@theme/logic/useLocales" diff --git a/packages/default-theme/middleware/auth.js b/packages/default-theme/src/middleware/auth.js similarity index 100% rename from packages/default-theme/middleware/auth.js rename to packages/default-theme/src/middleware/auth.js diff --git a/packages/default-theme/middleware/checkout.js b/packages/default-theme/src/middleware/checkout.js similarity index 100% rename from packages/default-theme/middleware/checkout.js rename to packages/default-theme/src/middleware/checkout.js diff --git a/packages/default-theme/pages/_.vue b/packages/default-theme/src/pages/_.vue similarity index 100% rename from packages/default-theme/pages/_.vue rename to packages/default-theme/src/pages/_.vue diff --git a/packages/default-theme/pages/_lang/_.vue b/packages/default-theme/src/pages/_lang/_.vue similarity index 100% rename from packages/default-theme/pages/_lang/_.vue rename to packages/default-theme/src/pages/_lang/_.vue diff --git a/packages/default-theme/pages/_lang/account.vue b/packages/default-theme/src/pages/_lang/account.vue similarity index 100% rename from packages/default-theme/pages/_lang/account.vue rename to packages/default-theme/src/pages/_lang/account.vue diff --git a/packages/default-theme/pages/_lang/account/addresses.vue b/packages/default-theme/src/pages/_lang/account/addresses.vue similarity index 100% rename from packages/default-theme/pages/_lang/account/addresses.vue rename to packages/default-theme/src/pages/_lang/account/addresses.vue diff --git a/packages/default-theme/pages/_lang/account/addresses/add/_id.vue b/packages/default-theme/src/pages/_lang/account/addresses/add/_id.vue similarity index 100% rename from packages/default-theme/pages/_lang/account/addresses/add/_id.vue rename to packages/default-theme/src/pages/_lang/account/addresses/add/_id.vue diff --git a/packages/default-theme/pages/_lang/account/addresses/add/index.vue b/packages/default-theme/src/pages/_lang/account/addresses/add/index.vue similarity index 100% rename from packages/default-theme/pages/_lang/account/addresses/add/index.vue rename to packages/default-theme/src/pages/_lang/account/addresses/add/index.vue diff --git a/packages/default-theme/pages/_lang/account/addresses/index.vue b/packages/default-theme/src/pages/_lang/account/addresses/index.vue similarity index 100% rename from packages/default-theme/pages/_lang/account/addresses/index.vue rename to packages/default-theme/src/pages/_lang/account/addresses/index.vue diff --git a/packages/default-theme/pages/_lang/account/orders.vue b/packages/default-theme/src/pages/_lang/account/orders.vue similarity index 100% rename from packages/default-theme/pages/_lang/account/orders.vue rename to packages/default-theme/src/pages/_lang/account/orders.vue diff --git a/packages/default-theme/pages/_lang/account/orders/_id.vue b/packages/default-theme/src/pages/_lang/account/orders/_id.vue similarity index 100% rename from packages/default-theme/pages/_lang/account/orders/_id.vue rename to packages/default-theme/src/pages/_lang/account/orders/_id.vue diff --git a/packages/default-theme/pages/_lang/account/orders/index.vue b/packages/default-theme/src/pages/_lang/account/orders/index.vue similarity index 100% rename from packages/default-theme/pages/_lang/account/orders/index.vue rename to packages/default-theme/src/pages/_lang/account/orders/index.vue diff --git a/packages/default-theme/pages/_lang/account/profile.vue b/packages/default-theme/src/pages/_lang/account/profile.vue similarity index 100% rename from packages/default-theme/pages/_lang/account/profile.vue rename to packages/default-theme/src/pages/_lang/account/profile.vue diff --git a/packages/default-theme/pages/_lang/checkout.vue b/packages/default-theme/src/pages/_lang/checkout.vue similarity index 100% rename from packages/default-theme/pages/_lang/checkout.vue rename to packages/default-theme/src/pages/_lang/checkout.vue diff --git a/packages/default-theme/pages/_lang/login.vue b/packages/default-theme/src/pages/_lang/login.vue similarity index 100% rename from packages/default-theme/pages/_lang/login.vue rename to packages/default-theme/src/pages/_lang/login.vue diff --git a/packages/default-theme/pages/_lang/order.vue b/packages/default-theme/src/pages/_lang/order.vue similarity index 100% rename from packages/default-theme/pages/_lang/order.vue rename to packages/default-theme/src/pages/_lang/order.vue diff --git a/packages/default-theme/pages/_lang/search.vue b/packages/default-theme/src/pages/_lang/search.vue similarity index 100% rename from packages/default-theme/pages/_lang/search.vue rename to packages/default-theme/src/pages/_lang/search.vue diff --git a/packages/default-theme/pages/account.vue b/packages/default-theme/src/pages/account.vue similarity index 100% rename from packages/default-theme/pages/account.vue rename to packages/default-theme/src/pages/account.vue diff --git a/packages/default-theme/pages/account/addresses.vue b/packages/default-theme/src/pages/account/addresses.vue similarity index 100% rename from packages/default-theme/pages/account/addresses.vue rename to packages/default-theme/src/pages/account/addresses.vue diff --git a/packages/default-theme/pages/account/addresses/add/_id.vue b/packages/default-theme/src/pages/account/addresses/add/_id.vue similarity index 100% rename from packages/default-theme/pages/account/addresses/add/_id.vue rename to packages/default-theme/src/pages/account/addresses/add/_id.vue diff --git a/packages/default-theme/pages/account/addresses/add/index.vue b/packages/default-theme/src/pages/account/addresses/add/index.vue similarity index 100% rename from packages/default-theme/pages/account/addresses/add/index.vue rename to packages/default-theme/src/pages/account/addresses/add/index.vue diff --git a/packages/default-theme/pages/account/addresses/index.vue b/packages/default-theme/src/pages/account/addresses/index.vue similarity index 100% rename from packages/default-theme/pages/account/addresses/index.vue rename to packages/default-theme/src/pages/account/addresses/index.vue diff --git a/packages/default-theme/pages/account/orders.vue b/packages/default-theme/src/pages/account/orders.vue similarity index 100% rename from packages/default-theme/pages/account/orders.vue rename to packages/default-theme/src/pages/account/orders.vue diff --git a/packages/default-theme/pages/account/orders/_id.vue b/packages/default-theme/src/pages/account/orders/_id.vue similarity index 100% rename from packages/default-theme/pages/account/orders/_id.vue rename to packages/default-theme/src/pages/account/orders/_id.vue diff --git a/packages/default-theme/pages/account/orders/index.vue b/packages/default-theme/src/pages/account/orders/index.vue similarity index 100% rename from packages/default-theme/pages/account/orders/index.vue rename to packages/default-theme/src/pages/account/orders/index.vue diff --git a/packages/default-theme/pages/account/profile.vue b/packages/default-theme/src/pages/account/profile.vue similarity index 100% rename from packages/default-theme/pages/account/profile.vue rename to packages/default-theme/src/pages/account/profile.vue diff --git a/packages/default-theme/pages/checkout.vue b/packages/default-theme/src/pages/checkout.vue similarity index 100% rename from packages/default-theme/pages/checkout.vue rename to packages/default-theme/src/pages/checkout.vue diff --git a/packages/default-theme/pages/login.vue b/packages/default-theme/src/pages/login.vue similarity index 100% rename from packages/default-theme/pages/login.vue rename to packages/default-theme/src/pages/login.vue diff --git a/packages/default-theme/pages/order.vue b/packages/default-theme/src/pages/order.vue similarity index 100% rename from packages/default-theme/pages/order.vue rename to packages/default-theme/src/pages/order.vue diff --git a/packages/default-theme/pages/search.vue b/packages/default-theme/src/pages/search.vue similarity index 100% rename from packages/default-theme/pages/search.vue rename to packages/default-theme/src/pages/search.vue diff --git a/packages/default-theme/plugins/notifications.js b/packages/default-theme/src/plugins/notifications.js similarity index 100% rename from packages/default-theme/plugins/notifications.js rename to packages/default-theme/src/plugins/notifications.js diff --git a/packages/default-theme/static/favicon.ico b/packages/default-theme/src/static/favicon.ico similarity index 100% rename from packages/default-theme/static/favicon.ico rename to packages/default-theme/src/static/favicon.ico diff --git a/packages/default-theme/static/icon.png b/packages/default-theme/src/static/icon.png similarity index 100% rename from packages/default-theme/static/icon.png rename to packages/default-theme/src/static/icon.png diff --git a/packages/default-theme/static/img/apple.png b/packages/default-theme/src/static/img/apple.png similarity index 100% rename from packages/default-theme/static/img/apple.png rename to packages/default-theme/src/static/img/apple.png diff --git a/packages/default-theme/static/img/bannerD.png b/packages/default-theme/src/static/img/bannerD.png similarity index 100% rename from packages/default-theme/static/img/bannerD.png rename to packages/default-theme/src/static/img/bannerD.png diff --git a/packages/default-theme/static/img/debit.png b/packages/default-theme/src/static/img/debit.png similarity index 100% rename from packages/default-theme/static/img/debit.png rename to packages/default-theme/src/static/img/debit.png diff --git a/packages/default-theme/static/img/electron.png b/packages/default-theme/src/static/img/electron.png similarity index 100% rename from packages/default-theme/static/img/electron.png rename to packages/default-theme/src/static/img/electron.png diff --git a/packages/default-theme/static/img/google.png b/packages/default-theme/src/static/img/google.png similarity index 100% rename from packages/default-theme/static/img/google.png rename to packages/default-theme/src/static/img/google.png diff --git a/packages/default-theme/static/img/imageA.png b/packages/default-theme/src/static/img/imageA.png similarity index 100% rename from packages/default-theme/static/img/imageA.png rename to packages/default-theme/src/static/img/imageA.png diff --git a/packages/default-theme/static/img/imageB.png b/packages/default-theme/src/static/img/imageB.png similarity index 100% rename from packages/default-theme/static/img/imageB.png rename to packages/default-theme/src/static/img/imageB.png diff --git a/packages/default-theme/static/img/imageC.png b/packages/default-theme/src/static/img/imageC.png similarity index 100% rename from packages/default-theme/static/img/imageC.png rename to packages/default-theme/src/static/img/imageC.png diff --git a/packages/default-theme/static/img/imageD.png b/packages/default-theme/src/static/img/imageD.png similarity index 100% rename from packages/default-theme/static/img/imageD.png rename to packages/default-theme/src/static/img/imageD.png diff --git a/packages/default-theme/static/img/logo.svg b/packages/default-theme/src/static/img/logo.svg similarity index 100% rename from packages/default-theme/static/img/logo.svg rename to packages/default-theme/src/static/img/logo.svg diff --git a/packages/default-theme/static/img/mastercard.png b/packages/default-theme/src/static/img/mastercard.png similarity index 100% rename from packages/default-theme/static/img/mastercard.png rename to packages/default-theme/src/static/img/mastercard.png diff --git a/packages/default-theme/static/img/productA.png b/packages/default-theme/src/static/img/productA.png similarity index 100% rename from packages/default-theme/static/img/productA.png rename to packages/default-theme/src/static/img/productA.png diff --git a/packages/default-theme/static/img/productB.png b/packages/default-theme/src/static/img/productB.png similarity index 100% rename from packages/default-theme/static/img/productB.png rename to packages/default-theme/src/static/img/productB.png diff --git a/packages/default-theme/static/img/productC.png b/packages/default-theme/src/static/img/productC.png similarity index 100% rename from packages/default-theme/static/img/productC.png rename to packages/default-theme/src/static/img/productC.png diff --git a/packages/default-theme/src/static/sw.js b/packages/default-theme/src/static/sw.js new file mode 100644 index 00000000..ea698990 --- /dev/null +++ b/packages/default-theme/src/static/sw.js @@ -0,0 +1 @@ +// THIS FILE SHOULD NOT BE VERSION CONTROLLED diff --git a/packages/default-theme/store/index.js b/packages/default-theme/store/index.js deleted file mode 100644 index 7efa5d1e..00000000 --- a/packages/default-theme/store/index.js +++ /dev/null @@ -1,49 +0,0 @@ -export const state = () => ({ - cart: null, - page: null, - user: null, - sessionContext: null, - locales: ["en-GB", "de-DE"], - locale: "en-GB", - initialListings: {}, - appliedListings: {}, -}) - -export const mutations = { - SET_CART(state, cart) { - state.cart = cart - }, - SET_PAGE(state, page) { - state.page = page - }, - SET_USER(state, user) { - state.user = user - }, - SET_SESSION_CONTEXT(state, sessionContext) { - state.sessionContext = sessionContext - }, - SET_LANG(state, locale) { - if (state.locales.includes(locale)) { - state.locale = locale - } - }, - SET_INITIAL_LISTING(state, { listingKey, initialListing }) { - state.initialListings = Object.assign({}, state.initialListings, { - [listingKey]: initialListing, - }) - }, - SET_APPLIED_LISTING(state, { listingKey, appliedListing }) { - state.appliedListings = Object.assign({}, state.appliedListings, { - [listingKey]: appliedListing, - }) - }, -} - -export const getters = { - getCart: (state) => state.cart, - getPage: (state) => state.page, - getUser: (state) => state.user, - getSessionContext: (state) => state.sessionContext, - getInitialListings: (state) => state.initialListings, - getAppliedListings: (state) => state.appliedListings, -} diff --git a/packages/nuxt-module/__tests__/useThemeAndProjectFiles.spec.ts b/packages/nuxt-module/__tests__/useThemeAndProjectFiles.spec.ts index 8752c4d0..2798f35b 100644 --- a/packages/nuxt-module/__tests__/useThemeAndProjectFiles.spec.ts +++ b/packages/nuxt-module/__tests__/useThemeAndProjectFiles.spec.ts @@ -104,11 +104,31 @@ describe("nuxt-module - theme", () => { const path = getTargetSourcePath(moduleObject); expect(path).toEqual(TARGET_SOURCE); }); + it("getThemeSourcePath should return theme path with direct import and dist folder inside", () => { + const themePath = getThemeSourcePath(moduleObject, mockedConfig); + expect(themePath).toEqual(path.join(THEME_SOURCE, "dist")); + }); it("getThemeSourcePath should return theme path with direct import", () => { - const path = getThemeSourcePath(moduleObject, mockedConfig); - expect(path).toEqual(THEME_SOURCE); + mockedFse.existsSync.mockReturnValueOnce(false); + const themePath = getThemeSourcePath(moduleObject, mockedConfig); + expect(themePath).toEqual(THEME_SOURCE); + }); + it("getThemeSourcePath whould return theme path with import from node_modules and dist folder inside", () => { + mockedFse.existsSync.mockReturnValueOnce(false); + mockedFse.existsSync.mockReturnValueOnce(false); + const sourcePath = getThemeSourcePath(moduleObject, mockedConfig); + expect(sourcePath).toEqual( + path.join( + moduleObject.options.rootDir, + "node_modules", + "mocked-theme", + "dist" + ) + ); }); it("getThemeSourcePath whould return theme path with import from node_modules", () => { + mockedFse.existsSync.mockReturnValueOnce(false); + mockedFse.existsSync.mockReturnValueOnce(false); mockedFse.existsSync.mockReturnValueOnce(false); const sourcePath = getThemeSourcePath(moduleObject, mockedConfig); expect(sourcePath).toEqual( diff --git a/packages/nuxt-module/package.json b/packages/nuxt-module/package.json index 58c4cbef..4c6ca9c0 100644 --- a/packages/nuxt-module/package.json +++ b/packages/nuxt-module/package.json @@ -24,7 +24,7 @@ "@shopware-pwa/default-theme": "0.4.2", "@shopware-pwa/helpers": "0.4.2", "@shopware-pwa/shopware-6-client": "0.4.2", - "chokidar": "^3.4.2", + "chokidar": "^3.4.3", "cookie-universal": "^2.1.4", "cosmiconfig": "^7.0.0", "fs-extra": "^9.0.1", diff --git a/packages/nuxt-module/src/theme.ts b/packages/nuxt-module/src/theme.ts index 34c51284..9e9e211d 100644 --- a/packages/nuxt-module/src/theme.ts +++ b/packages/nuxt-module/src/theme.ts @@ -6,14 +6,35 @@ export function getTargetSourcePath(moduleObject: NuxtModuleOptions) { return path.join(moduleObject.options.rootDir, ".shopware-pwa", "source"); } +/** + * common code with shopware-pwa-extension.ts - toolbox.getThemePath + * should be moved to commons + */ export function getThemeSourcePath( moduleObject: NuxtModuleOptions, config: ShopwarePwaConfigFile ) { + const directDistPath = path.join( + moduleObject.options.rootDir, + config.theme, + "dist" + ); + const directDistPathExist = fse.existsSync(directDistPath); + if (directDistPathExist) return directDistPath; + const directPath = path.join(moduleObject.options.rootDir, config.theme); const directPathExist = fse.existsSync(directPath); if (directPathExist) return directPath; + const nodePackageDistPath = path.join( + moduleObject.options.rootDir, + "node_modules", + config.theme, + "dist" + ); + const nodePackageDistPathExist = fse.existsSync(nodePackageDistPath); + if (nodePackageDistPathExist) return nodePackageDistPath; + const nodePackagePath = path.join( moduleObject.options.rootDir, "node_modules", diff --git a/packages/theme-base/.gitignore b/packages/theme-base/.gitignore index 9e6d3e7d..e94c7c4b 100644 --- a/packages/theme-base/.gitignore +++ b/packages/theme-base/.gitignore @@ -1,7 +1,7 @@ node_modules node_modules_dev lerna-debug.log -dist +!dist .DS_Store .yalc yalc.lock \ No newline at end of file diff --git a/packages/theme-base/src/app/router.scrollBehavior.js b/packages/theme-base/dist/app/router.scrollBehavior.js similarity index 100% rename from packages/theme-base/src/app/router.scrollBehavior.js rename to packages/theme-base/dist/app/router.scrollBehavior.js diff --git a/packages/theme-base/src/assets/scss/main.scss b/packages/theme-base/dist/assets/scss/main.scss similarity index 100% rename from packages/theme-base/src/assets/scss/main.scss rename to packages/theme-base/dist/assets/scss/main.scss diff --git a/packages/theme-base/src/assets/scss/variables.scss b/packages/theme-base/dist/assets/scss/variables.scss similarity index 100% rename from packages/theme-base/src/assets/scss/variables.scss rename to packages/theme-base/dist/assets/scss/variables.scss diff --git a/packages/theme-base/src/cms/cmsMap.json b/packages/theme-base/dist/cms/cmsMap.json similarity index 100% rename from packages/theme-base/src/cms/cmsMap.json rename to packages/theme-base/dist/cms/cmsMap.json diff --git a/packages/theme-base/src/helpers/formatPrice.js b/packages/theme-base/dist/helpers/formatPrice.js similarity index 100% rename from packages/theme-base/src/helpers/formatPrice.js rename to packages/theme-base/dist/helpers/formatPrice.js diff --git a/packages/theme-base/src/layouts/default.vue b/packages/theme-base/dist/layouts/default.vue similarity index 100% rename from packages/theme-base/src/layouts/default.vue rename to packages/theme-base/dist/layouts/default.vue diff --git a/packages/theme-base/src/locales/de-DE.json b/packages/theme-base/dist/locales/de-DE.json similarity index 100% rename from packages/theme-base/src/locales/de-DE.json rename to packages/theme-base/dist/locales/de-DE.json diff --git a/packages/theme-base/src/locales/en-GB.json b/packages/theme-base/dist/locales/en-GB.json similarity index 100% rename from packages/theme-base/src/locales/en-GB.json rename to packages/theme-base/dist/locales/en-GB.json diff --git a/packages/theme-base/src/logic/useLocales.js b/packages/theme-base/dist/logic/useLocales.js similarity index 100% rename from packages/theme-base/src/logic/useLocales.js rename to packages/theme-base/dist/logic/useLocales.js diff --git a/packages/theme-base/src/pages/_.vue b/packages/theme-base/dist/pages/_.vue similarity index 100% rename from packages/theme-base/src/pages/_.vue rename to packages/theme-base/dist/pages/_.vue diff --git a/packages/theme-base/src/pages/_lang/_.vue b/packages/theme-base/dist/pages/_lang/_.vue similarity index 100% rename from packages/theme-base/src/pages/_lang/_.vue rename to packages/theme-base/dist/pages/_lang/_.vue diff --git a/packages/theme-base/src/store/index.js b/packages/theme-base/dist/store/index.js similarity index 100% rename from packages/theme-base/src/store/index.js rename to packages/theme-base/dist/store/index.js diff --git a/packages/theme-base/package.json b/packages/theme-base/package.json index 7c723a29..fa290102 100644 --- a/packages/theme-base/package.json +++ b/packages/theme-base/package.json @@ -1,15 +1,13 @@ { "name": "@shopware-pwa/theme-base", - "version": "0.0.1", + "version": "0.4.2", "author": "patzick <13100280+patzick@users.noreply.github.com>", "license": "MIT", - "baseTheme": "", - "private": true, + "files": [ + "dist" + ], "scripts": { - "build": "shopware-pwa build-theme", - "dev": "shopware-pwa dev-theme", - "postinstall": "yarn build && cd ./dist && yarn link", - "release": "yarn build && cd ./dist && yarn publish" + "build": "echo theme-base is built" }, "dependencies": { "currency.js": "^2.0.3" diff --git a/scripts/build.js b/scripts/build.js index ac45b4ba..b002574a 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -39,22 +39,27 @@ const buildAllMatching = args.all || args.a; run(); async function run() { - if (!targets.length) { - const buildedCorrectly = await buildAll(buildTargets); - if (buildedCorrectly === false) process.exit(1); - if (isCIRun) { - for (let index = 0; index < allTargets.length; index++) { - const pkgDir = path.resolve(`packages/${allTargets[index]}`); - await execa("npx", ["yalc", "push"], { - stdio: "inherit", - cwd: pkgDir, - }); + try { + if (!targets.length) { + const buildedCorrectly = await buildAll(buildTargets); + if (buildedCorrectly === false) process.exit(1); + if (isCIRun) { + for (let index = 0; index < allTargets.length; index++) { + const pkgDir = path.resolve(`packages/${allTargets[index]}`); + await execa("npx", ["yalc", "push"], { + stdio: "inherit", + cwd: pkgDir, + }); + } } + checkAllSizes(buildTargets); + } else { + await buildAll(fuzzyMatchTarget(targets, buildAllMatching)); + checkAllSizes(fuzzyMatchTarget(targets, buildAllMatching)); } - checkAllSizes(buildTargets); - } else { - await buildAll(fuzzyMatchTarget(targets, buildAllMatching)); - checkAllSizes(fuzzyMatchTarget(targets, buildAllMatching)); + } catch (e) { + console.error("Build error", e); + process.exit(1); } } @@ -71,6 +76,12 @@ async function buildAll(targets) { ) ) ); + if (!fs.existsSync("temp")) { + console.log( + chalk.bold(chalk.yellow(`No definition found in "temp" directory.`)) + ); + return; + } await execa( "api-documenter", ["markdown", "-i", "./temp", "-o", "./docs/landing/resources/api"], diff --git a/scripts/linkDependencies.js b/scripts/linkDependencies.js index 47ee7441..c6cb411d 100644 --- a/scripts/linkDependencies.js +++ b/scripts/linkDependencies.js @@ -7,6 +7,7 @@ const path = require("path"); const apiClientDir = path.resolve(__dirname, "../packages/shopware-6-client"); const composablesDir = path.resolve(__dirname, "../packages/composables"); +const themeBaseDir = path.resolve(__dirname, "../packages/theme-base"); const defaultThemeDir = path.resolve(__dirname, "../packages/default-theme"); const nuxtModuleDir = path.resolve(__dirname, "../packages/nuxt-module"); const helpersDir = path.resolve(__dirname, "../packages/helpers"); @@ -81,6 +82,10 @@ async function run() { stdio: "inherit", cwd: nuxtModuleDir, }); + await execa("yarn", ["link", "@shopware-pwa/nuxt-module"], { + stdio: "inherit", + cwd: cliDir, + }); /** * Link CLI dir @@ -89,10 +94,21 @@ async function run() { stdio: "inherit", cwd: cliDir, }); + await execa("yarn", ["link", "@shopware-pwa/cli"], { + stdio: "inherit", + cwd: defaultThemeDir, + }); - await execa("yarn", ["link", "@shopware-pwa/nuxt-module"], { + /** + * Link theme-base dir + */ + await execa("yarn", ["link"], { stdio: "inherit", - cwd: cliDir, + cwd: themeBaseDir, + }); + await execa("yarn", ["link", "@shopware-pwa/theme-base"], { + stdio: "inherit", + cwd: defaultThemeDir, }); /** diff --git a/scripts/release.js b/scripts/release.js index fc772de3..05a9a3d9 100644 --- a/scripts/release.js +++ b/scripts/release.js @@ -216,18 +216,11 @@ async function publishPackage(pkgName, version, runIfNotDry) { if (skippedPackages.includes(pkgName)) { return; } - let pkgRoot = getPkgRoot(pkgName); + const pkgRoot = getPkgRoot(pkgName); const pkgPath = path.resolve(pkgRoot, "package.json"); const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8")); if (pkg.private) { - // if package is private and has dist folder with package.json it tries to publish from dist folder - const pkgDistRoot = path.resolve(pkgRoot, "dist"); - const pkgDistPath = path.resolve(pkgDistRoot, "package.json"); - if (!fs.existsSync(pkgDistPath)) return; - const distPackage = JSON.parse(fs.readFileSync(pkgDistPath, "utf-8")); - if (distPackage.private) return; - - pkgRoot = pkgDistRoot; + return; } const releaseTag = isCanaryRelease ? "canary" : null; diff --git a/scripts/utils.js b/scripts/utils.js index 5f062624..69002b26 100644 --- a/scripts/utils.js +++ b/scripts/utils.js @@ -1,7 +1,7 @@ const fs = require("fs"); const chalk = require("chalk"); -const ownBuildProcessPackages = ["default-theme", "commons"]; +const ownBuildProcessPackages = ["commons"]; const allTargets = (exports.allTargets = fs .readdirSync("packages") diff --git a/yarn.lock b/yarn.lock index 6ca53d96..750298ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4995,6 +4995,21 @@ chokidar@^3.4.1, chokidar@^3.4.2: optionalDependencies: fsevents "~2.1.2" +chokidar@^3.4.3: + version "3.4.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b" + integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ== + dependencies: + anymatch "~3.1.1" + braces "~3.0.2" + glob-parent "~5.1.0" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.5.0" + optionalDependencies: + fsevents "~2.1.2" + chownr@^1.1.1, chownr@^1.1.2: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" @@ -13844,6 +13859,13 @@ readdirp@~3.4.0: dependencies: picomatch "^2.2.1" +readdirp@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" + integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== + dependencies: + picomatch "^2.2.1" + rechoir@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"