refactor(core): merge core packages (#358)

* move * update core * update deps * update after merge * replace paths * final touches * update tests * hotfix * fix test * fix * update tsconfig * merge core * update travis cache * merge Co-authored-by: andrzejewsky <vox3r69@gmail.com>
vuestorefront · Apr 14, 2020 · aa0ddd0 · aa0ddd0
1 parent e498a18
commit aa0ddd0
Show file tree

Hide file tree

Showing 111 changed files with 3,004 additions and 1,184 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,12 +19,8 @@ cache:
     - packages/about-you/api-client/lib
     - packages/about-you/composables/node_modules
     - packages/about-you/composables/lib
-    - packages/core/utils/node_modules
-    - packages/core/utils/lib
-    - packages/core/factories/node_modules
-    - packages/core/factories/lib
-    - packages/core/interfaces/node_modules
-    - packages/core/interfaces/lib
+    - packages/core/core/node_modules
+    - packages/core/core/lib
     - packages/prismic/node_modules
     - packages/prismic/lib
 

diff --git a/package.json b/package.json
@@ -7,10 +7,7 @@
   "scripts": {
     "build:docs": "cd packages/core/docs && yarn build",
     "dev:docs": "cd packages/core/docs && yarn dev",
-    "build:core:interfaces": "cd packages/core/interfaces && tsc",
-    "build:core:utils": "cd packages/core/utils && yarn build",
-    "build:core:factories": "cd packages/core/factories && yarn build",
-    "build:core": "yarn build:core:interfaces && yarn build:core:utils && yarn build:core:factories",
+    "build:core": "cd packages/core/core && yarn build",
     "build:prismic": "cd packages/prismic && yarn build",
     "build:ay:api-client": "cd packages/about-you/api-client && yarn build",
     "build:ay:composables": "cd packages/about-you/composables && yarn build",
@@ -75,6 +72,7 @@
       "packages/commercetools/*",
       "packages/boilerplate/*",
       "packages/core/*",
+      "packages/core/core",
       "packages/prismic",
       "packages/about-you/*"
     ],

diff --git a/packages/about-you/composables/__tests__/composables/useCategory/index.spec.ts b/packages/about-you/composables/__tests__/composables/useCategory/index.spec.ts
@@ -5,7 +5,7 @@ jest.mock('@vue-storefront/about-you-api', () => ({
     Promise.resolve({})
 }));
 
-jest.mock('@vue-storefront/factories', () => ({
+jest.mock('@vue-storefront/core', () => ({
   useCategoryFactory: jest.fn(() => () => ({ foo: 'bar' }))
 }));
 

diff --git a/packages/about-you/composables/__tests__/composables/useProduct/index.spec.ts b/packages/about-you/composables/__tests__/composables/useProduct/index.spec.ts
@@ -3,7 +3,7 @@ import useProduct from '../../../src/composables/useProduct';
 import { mapProductSearch } from '../../../src/helpers';
 
 jest.mock('@vue-storefront/about-you-api');
-jest.mock('@vue-storefront/factories', () => ({
+jest.mock('@vue-storefront/core', () => ({
   useProductFactory: jest.fn(() => () => ({ foo: 'bar' }))
 }));
 

diff --git a/packages/about-you/composables/package.json b/packages/about-you/composables/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@vue-storefront/about-you-api": "^0.0.1",
     "@vue/composition-api": "^0.3.4",
-    "@vue-storefront/factories": "^0.0.1",
+    "@vue-storefront/core": "^2.0.0",
     "vue": "^2.6.x"
   },
   "devDependencies": {

diff --git a/packages/about-you/composables/src/composables/getters/cartGetters.ts b/packages/about-you/composables/src/composables/getters/cartGetters.ts
@@ -1,6 +1,6 @@
 /* istanbul ignore file */
 
-import { CartGetters, AgnosticPrice, AgnosticTotals } from '@vue-storefront/interfaces';
+import { CartGetters, AgnosticPrice, AgnosticTotals } from '@vue-storefront/core';
 import { Cart, LineItem } from '@vue-storefront/boilerplate-api/src/types';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars

diff --git a/packages/about-you/composables/src/composables/getters/categoryGetters.ts b/packages/about-you/composables/src/composables/getters/categoryGetters.ts
@@ -1,6 +1,6 @@
 /* istanbul ignore file */
 
-import { CategoryGetters, AgnosticCategoryTree } from '@vue-storefront/interfaces';
+import { CategoryGetters, AgnosticCategoryTree } from '@vue-storefront/core';
 import { Category } from '@vue-storefront/boilerplate-api/src/types';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars

diff --git a/packages/about-you/composables/src/composables/getters/checkoutGetters.ts b/packages/about-you/composables/src/composables/getters/checkoutGetters.ts
@@ -1,6 +1,6 @@
 /* istanbul ignore file */
 
-import { CheckoutGetters} from '@vue-storefront/interfaces';
+import { CheckoutGetters} from '@vue-storefront/core';
 import { ShippingMethod } from '@vue-storefront/boilerplate-api/src/types';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars

diff --git a/packages/about-you/composables/src/composables/getters/orderGetters.ts b/packages/about-you/composables/src/composables/getters/orderGetters.ts
@@ -1,6 +1,6 @@
 /* istanbul ignore file */
 
-import { UserOrderGetters } from '@vue-storefront/interfaces';
+import { UserOrderGetters } from '@vue-storefront/core';
 import { BapiOrder } from '../../types';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars

diff --git a/packages/about-you/composables/src/composables/getters/productGetters.ts b/packages/about-you/composables/src/composables/getters/productGetters.ts
@@ -5,7 +5,7 @@ import {
   AgnosticAttribute,
   AgnosticPrice,
   ProductGetters
-} from '@vue-storefront/interfaces';
+} from '@vue-storefront/core';
 import { ProductVariant } from '@vue-storefront/boilerplate-api/src/types';
 
 type ProductVariantFilters = any

diff --git a/packages/about-you/composables/src/composables/getters/userGetters.ts b/packages/about-you/composables/src/composables/getters/userGetters.ts
@@ -1,6 +1,6 @@
 /* istanbul ignore file */
 
-import { UserGetters} from '@vue-storefront/interfaces';
+import { UserGetters} from '@vue-storefront/core';
 import {BapiUser} from '../../types';
 
 export const getUserFirstName = (user: BapiUser): string => user ? user.firstName : '';

diff --git a/packages/about-you/composables/src/composables/useCart/index.ts b/packages/about-you/composables/src/composables/useCart/index.ts
@@ -1,7 +1,7 @@
 /* istanbul ignore file */
 
-import { UseCart } from '@vue-storefront/interfaces';
-import { useCartFactory, UseCartFactoryParams } from '@vue-storefront/factories';
+import { UseCart } from '@vue-storefront/core';
+import { useCartFactory, UseCartFactoryParams } from '@vue-storefront/core';
 import { ref, Ref } from '@vue/composition-api';
 import { BapiCart, BapiCartItem, BapiCoupon, BapiProduct } from '../../types';
 

diff --git a/packages/about-you/composables/src/composables/useCategory/index.ts b/packages/about-you/composables/src/composables/useCategory/index.ts
@@ -1,5 +1,5 @@
 import { getCategory } from '@vue-storefront/about-you-api';
-import { useCategoryFactory } from '@vue-storefront/factories';
+import { useCategoryFactory } from '@vue-storefront/core';
 import { UseCategory, BapiCategory } from '../../types';
 
 const useCategory: (id: string) => UseCategory<BapiCategory> = useCategoryFactory<BapiCategory, any>({

diff --git a/packages/about-you/composables/src/composables/useCheckout/index.ts b/packages/about-you/composables/src/composables/useCheckout/index.ts
@@ -1,6 +1,6 @@
 /* istanbul ignore file */
 
-import { UseCheckout } from '@vue-storefront/interfaces';
+import { UseCheckout } from '@vue-storefront/core';
 import { ref, Ref, computed } from '@vue/composition-api';
 import { BapiUser, BapiShippingMethod, BapiUserAddress } from '../../types';
 

diff --git a/packages/about-you/composables/src/composables/useLocale/factoryParams.ts b/packages/about-you/composables/src/composables/useLocale/factoryParams.ts
@@ -1,6 +1,6 @@
 /* istanbul ignore file */
 
-import { UseLocaleFactoryParams } from '@vue-storefront/factories';
+import { UseLocaleFactoryParams } from '@vue-storefront/core';
 
 import {
   countries,

diff --git a/packages/about-you/composables/src/composables/useLocale/index.ts b/packages/about-you/composables/src/composables/useLocale/index.ts
@@ -1,7 +1,7 @@
 /* istanbul ignore file */
 
-import { UseLocale } from '@vue-storefront/interfaces';
-import { useLocaleFactory } from '@vue-storefront/factories';
+import { UseLocale } from '@vue-storefront/core';
+import { useLocaleFactory } from '@vue-storefront/core';
 
 import { params } from './factoryParams';
 

diff --git a/packages/about-you/composables/src/composables/useProduct/index.ts b/packages/about-you/composables/src/composables/useProduct/index.ts
@@ -1,4 +1,4 @@
-import { useProductFactory } from '@vue-storefront/factories';
+import { useProductFactory } from '@vue-storefront/core';
 import { mapProductSearch } from '../../helpers';
 import { UseProduct, BapiProduct } from '../../types';
 

diff --git a/packages/about-you/composables/src/composables/useUser/factoryParams.ts b/packages/about-you/composables/src/composables/useUser/factoryParams.ts
@@ -1,6 +1,6 @@
 /* istanbul ignore file */
 
-import { UseUserFactoryParams } from '@vue-storefront/factories';
+import { UseUserFactoryParams } from '@vue-storefront/core';
 import { BapiUser } from '../../types';
 
 export const params: UseUserFactoryParams<BapiUser, any, any> = {

diff --git a/packages/about-you/composables/src/composables/useUser/index.ts b/packages/about-you/composables/src/composables/useUser/index.ts
@@ -1,10 +1,10 @@
 /* istanbul ignore file */
 
-import { UseUser } from '@vue-storefront/interfaces';
+import { UseUser } from '@vue-storefront/core';
 import { BapiUser } from '../../types';
 
 import { params } from './factoryParams';
-import { useUserFactory } from '@vue-storefront/factories';
+import { useUserFactory } from '@vue-storefront/core';
 
 // @todo useUser
 

diff --git a/packages/about-you/composables/src/composables/useUserOrders/index.ts b/packages/about-you/composables/src/composables/useUserOrders/index.ts
@@ -1,8 +1,8 @@
 /* istanbul ignore file */
 
-import { useUserOrdersFactory, UseUserOrdersFactoryParams } from '@vue-storefront/factories';
+import { useUserOrdersFactory, UseUserOrdersFactoryParams } from '@vue-storefront/core';
 import { BapiOrder, BapiOrderSearchParams } from '../../types';
-import { SearchResult } from '@vue-storefront/interfaces';
+import { SearchResult } from '@vue-storefront/core';
 
 // @todo userOrders
 

diff --git a/packages/about-you/composables/src/composables/useWishlist/index.ts b/packages/about-you/composables/src/composables/useWishlist/index.ts
@@ -1,6 +1,6 @@
 /* istanbul ignore file */
 
-import { ComputedProperty, UseWishlist } from '@vue-storefront/interfaces';
+import { ComputedProperty, UseWishlist } from '@vue-storefront/core';
 import { computed, Ref, ref } from '@vue/composition-api';
 import { BapiProduct, BapiWishlist, BapiWishlistProduct } from '../../types';
 

diff --git a/packages/about-you/composables/src/helpers/mapProductSearch.ts b/packages/about-you/composables/src/helpers/mapProductSearch.ts
@@ -1,6 +1,4 @@
-/* istanbul ignore file */
-
-import { SearchResult } from '@vue-storefront/interfaces';
+import { SearchResult } from '@vue-storefront/core';
 import { getProduct } from '@vue-storefront/about-you-api';
 import { BapiProduct } from '@aboutyou/backbone/types/BapiProduct';
 

diff --git a/packages/about-you/composables/src/types/index.ts b/packages/about-you/composables/src/types/index.ts
@@ -1,7 +1,7 @@
 import { BapiCategory } from '@aboutyou/backbone/types/BapiCategory';
 import { BapiProduct } from '@aboutyou/backbone/types/BapiProduct';
-import { UseCategory } from '@vue-storefront/interfaces';
-import { UseProduct } from '@vue-storefront/interfaces';
+import { UseCategory } from '@vue-storefront/core';
+import { UseProduct } from '@vue-storefront/core';
 
 // @todo: replace with real BapiUser type when AYC publishes that part of api
 type BapiUser = {

diff --git a/packages/about-you/theme/nuxt.config.js b/packages/about-you/theme/nuxt.config.js
@@ -34,13 +34,13 @@ export default {
       useRawSource: {
         dev: [
           '@vue-storefront/about-you',
-          '@vue-storefront/utils',
-          '@vue-storefront/factories'
+          '@vue-storefront/core',
+          '@vue-storefront/core'
         ],
         prod: [
           '@vue-storefront/about-you',
-          '@vue-storefront/utils',
-          '@vue-storefront/factories'
+          '@vue-storefront/core',
+          '@vue-storefront/core'
         ]
       }
     }],

diff --git a/packages/boilerplate/api-client/package.json b/packages/boilerplate/api-client/package.json
@@ -11,7 +11,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@vue-storefront/factories": "^0.0.1"
+    "@vue-storefront/core": "^2.0.0"
   },
   "files": [
     "lib/**/*"

diff --git a/packages/boilerplate/api-client/src/index.ts b/packages/boilerplate/api-client/src/index.ts
@@ -1,5 +1,5 @@
 import getProduct from './api/getProduct';
-import { apiClientFactory } from '@vue-storefront/factories';
+import { apiClientFactory } from '@vue-storefront/core';
 
 const { setup, override } = apiClientFactory<any, any>();
 

diff --git a/packages/boilerplate/composables/package.json b/packages/boilerplate/composables/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@vue-storefront/boilerplate-api": "^0.0.1",
-    "@vue-storefront/interfaces": "^0.0.3",
+    "@vue-storefront/core": "^2.0.0",
     "@vue/composition-api": "^0.3.4"
   },
   "files": [

diff --git a/packages/boilerplate/composables/src/getters/cartGetters.ts b/packages/boilerplate/composables/src/getters/cartGetters.ts
@@ -1,4 +1,4 @@
-import { CartGetters, AgnosticPrice, AgnosticTotals, AgnosticAttribute } from '@vue-storefront/interfaces';
+import { CartGetters, AgnosticPrice, AgnosticTotals, AgnosticAttribute } from '@vue-storefront/core';
 import { Cart, LineItem } from '@vue-storefront/boilerplate-api/src/types';
 
 export const getCartItems = (cart: Cart): LineItem[] => [];

diff --git a/packages/boilerplate/composables/src/getters/categoryGetters.ts b/packages/boilerplate/composables/src/getters/categoryGetters.ts
@@ -1,4 +1,4 @@
-import { CategoryGetters, AgnosticCategoryTree } from '@vue-storefront/interfaces';
+import { CategoryGetters, AgnosticCategoryTree } from '@vue-storefront/core';
 import { Category } from '@vue-storefront/boilerplate-api/src/types';
 
 export const getCategoryTree = (category: Category): AgnosticCategoryTree => {

diff --git a/packages/boilerplate/composables/src/getters/checkoutGetters.ts b/packages/boilerplate/composables/src/getters/checkoutGetters.ts
@@ -1,4 +1,4 @@
-import { CheckoutGetters} from '@vue-storefront/interfaces';
+import { CheckoutGetters} from '@vue-storefront/core';
 import { ShippingMethod } from '@vue-storefront/boilerplate-api/src/types';
 
 export const getShippingMethodId = (shippingMethod: ShippingMethod): string => '';

diff --git a/packages/boilerplate/composables/src/getters/productGetters.ts b/packages/boilerplate/composables/src/getters/productGetters.ts
@@ -3,7 +3,7 @@ import {
   AgnosticAttribute,
   AgnosticPrice,
   ProductGetters
-} from '@vue-storefront/interfaces';
+} from '@vue-storefront/core';
 import { ProductVariant } from '@vue-storefront/boilerplate-api/src/types';
 
 type ProductVariantFilters = any

diff --git a/packages/boilerplate/composables/src/useCart/index.ts b/packages/boilerplate/composables/src/useCart/index.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-vars, @typescript-eslint/no-unused-vars */
-import { UseCart } from '@vue-storefront/interfaces';
+import { UseCart } from '@vue-storefront/core';
 import { Ref, ref } from '@vue/composition-api';
 import { Cart, ProductVariant } from '@vue-storefront/boilerplate-api/src/types';
 

diff --git a/packages/boilerplate/composables/src/useCategory/index.ts b/packages/boilerplate/composables/src/useCategory/index.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-vars, @typescript-eslint/no-unused-vars */
-import { UseCategory } from '@vue-storefront/interfaces';
+import { UseCategory } from '@vue-storefront/core';
 import { ref, Ref } from '@vue/composition-api';
 import { Category, CategoryFilter } from '@vue-storefront/boilerplate-api/src/types';
 

diff --git a/packages/boilerplate/composables/src/useCheckout/index.ts b/packages/boilerplate/composables/src/useCheckout/index.ts
@@ -1,4 +1,4 @@
-// import { UseCheckout } from '@vue-storefront/interfaces';
+// import { UseCheckout } from '@vue-storefront/core';
 // import { ref, Ref, watch } from '@vue/composition-api';
 
 // export default function useCheckout (): UseCheckout<any, any, any, any, any, any, any, any> {

diff --git a/packages/boilerplate/composables/src/useProduct/index.ts b/packages/boilerplate/composables/src/useProduct/index.ts
@@ -1,4 +1,4 @@
-import { UseProduct } from '@vue-storefront/interfaces';
+import { UseProduct } from '@vue-storefront/core';
 import { ref, Ref } from '@vue/composition-api';
 import { ProductVariant } from '@vue-storefront/boilerplate-api/src/types';
 

diff --git a/packages/boilerplate/composables/src/useWishlist/index.ts b/packages/boilerplate/composables/src/useWishlist/index.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-vars, @typescript-eslint/no-unused-vars */
-import { UseWishlist } from '@vue-storefront/interfaces';
+import { UseWishlist } from '@vue-storefront/core';
 import { Ref, ref, watch } from '@vue/composition-api';
 import { Wishlist, ProductVariant } from '@vue-storefront/boilerplate-api/src/types';
 

diff --git a/packages/commercetools/composables/__tests__/useCart/useCart.spec.ts b/packages/commercetools/composables/__tests__/useCart/useCart.spec.ts
@@ -13,7 +13,7 @@ jest.mock('@vue-storefront/commercetools-api', () => ({
   updateCartQuantity: jest.fn(() => ({ data: { cart: 'some cart' } }))
 }));
 
-jest.mock('@vue-storefront/factories', () => ({
+jest.mock('@vue-storefront/core', () => ({
   useCartFactory: (params) => () => params,
 }));
 

diff --git a/packages/commercetools/composables/__tests__/useCategory/useCategory.spec.ts b/packages/commercetools/composables/__tests__/useCategory/useCategory.spec.ts
@@ -21,7 +21,7 @@ jest.mock('@vue-storefront/commercetools-api', () => ({
     }))
 }));
 
-jest.mock('@vue-storefront/factories', () => ({
+jest.mock('@vue-storefront/core', () => ({
   useCategoryFactory: (params) => () => params
 }));
 

diff --git a/packages/commercetools/composables/__tests__/useLocale/useLocale.ts b/packages/commercetools/composables/__tests__/useLocale/useLocale.ts
@@ -1,12 +1,12 @@
-jest.mock('@vue-storefront/factories', () => ({
+jest.mock('@vue-storefront/core', () => ({
   useLocaleFactory: jest.fn(() => () => ({locale: 'en'}))
 }));
 
 jest.mock('../../src/useLocale/factoryParams', () => ({
   params: {}
 }));
 
-import { useLocaleFactory } from '@vue-storefront/factories';
+import { useLocaleFactory } from '@vue-storefront/core';
 import { params } from '../../src/useLocale/factoryParams';
 import useLocale from '../../src/useLocale';
 describe('[commercetools-composables] useLocale', () => {

diff --git a/packages/commercetools/composables/__tests__/useProduct/useProduct.spec.ts b/packages/commercetools/composables/__tests__/useProduct/useProduct.spec.ts
@@ -34,7 +34,7 @@ jest.mock('@vue-storefront/commercetools-api', () => ({
 
 jest.mock('./../../src/helpers/internals/enhanceProduct', () => jest.fn((args) => args));
 
-jest.mock('@vue-storefront/factories', () => ({
+jest.mock('@vue-storefront/core', () => ({
   useProductFactory: (params) => () => params
 }));
 

diff --git a/packages/commercetools/composables/__tests__/useUser/index.spec.ts b/packages/commercetools/composables/__tests__/useUser/index.spec.ts
@@ -1,12 +1,12 @@
-jest.mock('@vue-storefront/factories', () => ({
+jest.mock('@vue-storefront/core', () => ({
   useUserFactory: jest.fn(() => () => ({user: 'api'}))
 }));
 
 jest.mock('../../src/useUser/factoryParams', () => ({
   params: {}
 }));
 
-import { useUserFactory } from '@vue-storefront/factories';
+import { useUserFactory } from '@vue-storefront/core';
 import { params } from '../../src/useUser/factoryParams';
 import useUser from '../../src/useUser';
 describe('[commercetools-composables] useUser', () => {

diff --git a/packages/commercetools/composables/__tests__/useUserOrders/useUserOrders.spec.ts b/packages/commercetools/composables/__tests__/useUserOrders/useUserOrders.spec.ts
@@ -11,7 +11,7 @@ jest.mock('@vue-storefront/commercetools-api', () => ({
   }))
 }));
 
-jest.mock('@vue-storefront/factories', () => ({
+jest.mock('@vue-storefront/core', () => ({
   useUserOrdersFactory: (params) => () => params
 }));
 

diff --git a/packages/commercetools/composables/package.json b/packages/commercetools/composables/package.json
@@ -12,9 +12,7 @@
   },
   "dependencies": {
     "@vue-storefront/commercetools-api": "^0.0.3",
-    "@vue-storefront/factories": "^0.0.1",
-    "@vue-storefront/interfaces": "^0.0.3",
-    "@vue-storefront/utils": "^0.0.3",
+    "@vue-storefront/core": "^2.0.0",
     "@vue/composition-api": "^0.3.4",
     "js-cookie": "^2.2.1",
     "vue": "^2.6.x"