@unchainedshop/plugins 3.0.0-alpha2 → 3.0.0-alpha3

package/src/payment/cryptopay/plugin.ts

@@ -1,11 +1,11 @@
-import { IPaymentAdapter } from '@unchainedshop/types/payments.js';
+import { IPaymentAdapter } from '@unchainedshop/core-payment';
 import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
 import { ethers } from 'ethers';
 import { BIP32Factory } from 'bip32';
 import * as ecc from 'tiny-secp256k1';
 import { networks, payments } from 'bitcoinjs-lib';
 import { createLogger } from '@unchainedshop/logger';
-import { UnchainedCore } from '@unchainedshop/types/core.js';
+import { UnchainedCore } from '@unchainedshop/core';
 import { OrderPricingSheet } from '@unchainedshop/core-orders';
 import { CryptopayModule } from './module/configureCryptopayModule.js';
 

package/src/payment/datatrans-v2/index.ts

@@ -1,7 +1,7 @@
-import { IPaymentAdapter } from '@unchainedshop/types/payments.js';
+import { IPaymentAdapter } from '@unchainedshop/core-payment';
 import { PaymentAdapter, PaymentError, PaymentDirector } from '@unchainedshop/core-payment';
 import { createLogger } from '@unchainedshop/logger';
-import { PaymentPricingRowCategory } from '@unchainedshop/types/payments.pricing.js';
+import { PaymentPricingRowCategory } from '@unchainedshop/core-payment';
 import createDatatransAPI from './api/index.js';
 import type {
   AuthorizeAuthenticatedResponseSuccess,
@@ -446,7 +446,7 @@ const Datatrans: IPaymentAdapter = {
             } else {
               settledTransaction = result as StatusResponseSuccess;
             }
-          } catch (e) {
+          } catch {
             await cancel({ transactionId, refno: settledTransaction.refno });
             logger.error(
               `Transaction declined / Transaction ID ${transactionId} authorization cancelled`,

package/src/payment/datatrans-v2/middleware.ts

@@ -1,5 +1,5 @@
 import { createLogger } from '@unchainedshop/logger';
-import { Context } from '@unchainedshop/types/api.js';
+import { Context } from '@unchainedshop/api';
 import generateSignature, { Security } from './generateSignature.js';
 
 import type { StatusResponseSuccess } from './api/types.js';

package/src/payment/datatrans-v2/roundedAmountFromOrder.ts

@@ -1,5 +1,5 @@
-import { UnchainedCore } from '@unchainedshop/types/core.js';
-import { Order } from '@unchainedshop/types/orders.js';
+import { UnchainedCore } from '@unchainedshop/core';
+import { Order } from '@unchainedshop/core-orders';
 
 const roundedAmountFromOrder = (
   order: Order,

package/src/payment/invoice-prepaid.ts

@@ -1,4 +1,4 @@
-import { IPaymentAdapter } from '@unchainedshop/types/payments.js';
+import { IPaymentAdapter } from '@unchainedshop/core-payment';
 import { PaymentDirector, PaymentAdapter, PaymentProviderType } from '@unchainedshop/core-payment';
 
 const InvoicePrepaid: IPaymentAdapter = {

package/src/payment/invoice.ts

@@ -1,4 +1,4 @@
-import { IPaymentAdapter } from '@unchainedshop/types/payments.js';
+import { IPaymentAdapter } from '@unchainedshop/core-payment';
 import { PaymentDirector, PaymentAdapter, PaymentProviderType } from '@unchainedshop/core-payment';
 
 const Invoice: IPaymentAdapter = {

package/src/payment/paypal-checkout.ts

@@ -1,7 +1,13 @@
-import { IPaymentAdapter } from '@unchainedshop/types/payments.js';
+import { IPaymentAdapter } from '@unchainedshop/core-payment';
 import { PaymentDirector, PaymentAdapter, PaymentError } from '@unchainedshop/core-payment';
 import { createLogger } from '@unchainedshop/logger';
-import checkoutNodeJssdk from '@paypal/checkout-server-sdk';
+
+let checkoutNodeJssdk;
+try {
+  checkoutNodeJssdk = await import('@paypal/checkout-server-sdk');
+} catch {
+  /* */
+}
 
 const logger = createLogger('unchained:core-payment');
 

package/src/payment/payrexx/index.ts

@@ -1,4 +1,4 @@
-import { IPaymentAdapter } from '@unchainedshop/types/payments.js';
+import { IPaymentAdapter } from '@unchainedshop/core-payment';
 import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
 import { createLogger } from '@unchainedshop/logger';
 import { mapOrderDataToGatewayObject, mapUserToGatewayObject } from './payrexx.js';

package/src/payment/payrexx/middleware.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/types/api.js';
+import { Context } from '@unchainedshop/api';
 import { createLogger } from '@unchainedshop/logger';
 
 const logger = createLogger('unchained:core-payment:payrexx:webhook');

package/src/payment/postfinance-checkout/api.ts

@@ -87,7 +87,7 @@ export const voidTransaction = async (transactionId: string): Promise<boolean> =
   try {
     await transactionVoidService.voidOnline(SPACE_ID, parseInt(transactionId, 10));
     return true;
-  } catch (e) {
+  } catch {
     return false;
   }
 };
@@ -107,7 +107,7 @@ export const refundTransaction = async (
   try {
     await refundService.refund(SPACE_ID, refund);
     return true;
-  } catch (e) {
+  } catch {
     return false;
   }
 };
@@ -117,7 +117,7 @@ export const confirmDeferredTransaction = async (transactionId: string): Promise
   try {
     await transactionCompletionService.completeOnline(SPACE_ID, parseInt(transactionId, 10));
     return true;
-  } catch (e) {
+  } catch {
     return false;
   }
 };

package/src/payment/postfinance-checkout/index.ts

@@ -2,7 +2,7 @@ import {
   IPaymentActions,
   IPaymentAdapter,
   PaymentChargeActionResult,
-} from '@unchainedshop/types/payments.js';
+} from '@unchainedshop/core-payment';
 import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
 import { createLogger } from '@unchainedshop/logger';
 

package/src/payment/postfinance-checkout/middleware.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/types/api.js';
+import { Context } from '@unchainedshop/api';
 import { createLogger } from '@unchainedshop/logger';
 import { WebhookData } from './types.js';
 import { getTransaction, getTransactionCompletion } from './api.js';

package/src/payment/postfinance-checkout/utils.ts

@@ -1,4 +1,4 @@
-import { Order, OrdersModule } from '@unchainedshop/types/orders.js';
+import { Order, OrdersModule } from '@unchainedshop/core-orders';
 import * as pf from 'postfinancecheckout';
 
 const { PostFinanceCheckout } = pf;

package/src/payment/saferpay/adapter.ts

@@ -1,6 +1,6 @@
-import { IPaymentAdapter } from '@unchainedshop/types/payments.js';
+import { IPaymentAdapter } from '@unchainedshop/core-payment';
 import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
-import { UnchainedCore } from '@unchainedshop/types/core.js';
+import { UnchainedCore } from '@unchainedshop/core';
 import { mongodb } from '@unchainedshop/mongodb';
 import { PaymentPageInitializeInput, SaferpayClient } from './api/index.js';
 import { buildSignature } from './buildSignature.js';

package/src/payment/saferpay/api/api/SaferpayClient.ts

@@ -1,4 +1,4 @@
-import { OrderPayment } from '@unchainedshop/types/orders.payments.js';
+import { OrderPayment } from '@unchainedshop/core-orders';
 import { TransactionCancelInput, TransactionCancelResponse } from '../models/TransactionCancel.js';
 import { TransactionCaptureInput, TransactionCaptureResponse } from '../models/TransactionCapture.js';
 import { PaymentPageAssertInput, PaymentPageAssertResponse } from '../models/PaymentPageAssert.js';

package/src/payment/saferpay/db/SaferpayTransactionsCollection.ts

@@ -1,5 +1,5 @@
 import { mongodb } from '@unchainedshop/mongodb';
-import { TimestampFields } from '@unchainedshop/types/common.js';
+import type { TimestampFields } from '@unchainedshop/mongodb';
 
 export type SaferpayTransaction = {
   orderPaymentId: any;

package/src/payment/saferpay/middleware.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/types/api.js';
+import { Context } from '@unchainedshop/api';
 import { createLogger } from '@unchainedshop/logger';
 import { buildSignature } from './buildSignature.js';
 import { SaferpayTransactionsModule } from './module/configureSaferpayTransactionsModule.js';

package/src/payment/stripe/index.ts

@@ -1,4 +1,4 @@
-import { IPaymentAdapter } from '@unchainedshop/types/payments.js';
+import { IPaymentAdapter } from '@unchainedshop/core-payment';
 import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
 import { createLogger } from '@unchainedshop/logger';
 import stripe, { createOrderPaymentIntent, createRegistrationIntent } from './stripe.js';

package/src/payment/stripe/middleware.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/types/api.js';
+import { Context } from '@unchainedshop/api';
 import { createLogger } from '@unchainedshop/logger';
 import stripe from './stripe.js';
 
@@ -80,9 +80,6 @@ export const stripeHandler = async (request, response) => {
       const order = await modules.orders.checkout(
         orderPayment.orderId,
         {
-          transactionContext: {
-            paymentIntentId: paymentIntent.id,
-          },
           paymentContext: {
             paymentIntentId: paymentIntent.id,
           },

package/src/payment/stripe/stripe.ts

@@ -1,12 +1,12 @@
-import { Order } from '@unchainedshop/types/orders.js';
-import { OrderPayment } from '@unchainedshop/types/orders.payments.js';
-import { IOrderPricingSheet } from '@unchainedshop/types/orders.pricing.js';
+import { Order } from '@unchainedshop/core-orders';
+import { OrderPayment } from '@unchainedshop/core-orders';
+import { IOrderPricingSheet } from '@unchainedshop/core-orders';
 import Stripe from 'stripe';
 
 const { STRIPE_SECRET, STRIPE_WEBHOOK_ENVIRONMENT, EMAIL_WEBSITE_NAME } = process.env;
 
 const stripe = new Stripe(STRIPE_SECRET, {
-  apiVersion: '2024-04-10',
+  apiVersion: '2024-06-20',
 });
 
 const environment = STRIPE_WEBHOOK_ENVIRONMENT ?? null;
@@ -35,7 +35,7 @@ export const upsertCustomer = async ({ userId, name, email }): Promise<string> =
     }
 
     return existingCustomer.id;
-  } catch (e) {
+  } catch {
     const customer = await stripe.customers.create({
       metadata: {
         userId,

package/src/plugins-index.ts

@@ -1,116 +1,68 @@
-import { ModuleInput, UnchainedCore } from '@unchainedshop/types/core.js';
+import { ModuleInput, UnchainedCore } from '@unchainedshop/core';
 import express from 'express';
 
+import baseModules from './presets/base-modules.js';
+import './presets/countries/ch.js';
+import cryptoModules from './presets/crypto-modules.js';
+
+import connectCryptoToExpress from './presets/crypto-express.js';
+import connectBaseToExpress from './presets/base-express.js';
+
 // Delivery
-import './delivery/post.js';
-import './delivery/pick-mup.js';
 import './delivery/send-message.js';
 import './delivery/stores.js';
 
 // Payment
-import './payment/invoice.js';
 import './payment/invoice-prepaid.js';
 import './payment/paypal-checkout.js';
 import { datatransHandler } from './payment/datatrans-v2/index.js';
-import { configureCryptopayModule, cryptopayHandler } from './payment/cryptopay/index.js';
 import { appleIAPHandler, configureAppleTransactionsModule } from './payment/apple-iap/index.js';
 import { stripeHandler } from './payment/stripe/index.js';
 import { postfinanceCheckoutHandler } from './payment/postfinance-checkout/index.js';
 import { configureSaferpayTransactionsModule, saferpayHandler } from './payment/saferpay/index.js';
 import { payrexxHandler } from './payment/payrexx/index.js';
 
-// Warehousing
-import './warehousing/store.js';
-import './warehousing/eth-minter.js';
-
-// Pricing
-import './pricing/free-payment.js';
-import './pricing/free-delivery.js';
-import './pricing/order-items.js';
-import './pricing/order-discount.js';
-import './pricing/order-delivery.js';
-import './pricing/order-payment.js';
-import './pricing/product-catalog-price.js';
-import './pricing/product-price-rateconversion.js';
-import './pricing/product-discount.js';
-import './pricing/product-swiss-tax.js';
-import './pricing/delivery-swiss-tax.js';
-
 // Filter & Search
 import './filters/strict-equal.js';
 import './filters/local-search.js';
 
-// Quotations
-import './quotations/manual.js';
-
-// Enrollments
-import './enrollments/licensed.js';
-
-// Event Queue
-import './events/node-event-emitter.js';
-
 // Workers
-import './worker/bulk-import.js';
-import './worker/zombie-killer.js';
-import './worker/message.js';
-import './worker/external.js';
-import './worker/http-request.js';
-import './worker/heartbeat.js';
-import './worker/email.js';
 import './worker/sms.js';
 import './worker/push-notification.js';
-import './worker/update-ecb-rates.js';
-import './worker/error-notifications.js';
-import './worker/update-coinbase-rates.js';
-import { configureExportToken } from './worker/export-token.js';
 import { configureGenerateOrderAutoscheduling } from './worker/enrollment-order-generator.js';
 
-// Asset Management
-import './files/gridfs/gridfs-adapter.js';
-import { gridfsHandler } from './files/gridfs/gridfs-webhook.js';
-import { configureGridFSFileUploadModule } from './files/gridfs/index.js';
-
 const {
-  CRYPTOPAY_WEBHOOK_PATH = '/payment/cryptopay',
   STRIPE_WEBHOOK_PATH = '/payment/stripe',
   PAYREXX_WEBHOOK_PATH = '/payment/payrexx',
   PFCHECKOUT_WEBHOOK_PATH = '/payment/postfinance-checkout',
   DATATRANS_WEBHOOK_PATH = '/payment/datatrans/webhook',
   APPLE_IAP_WEBHOOK_PATH = '/payment/apple-iap',
-  // MINIO_PUT_SERVER_PATH = '/minio',
-  GRIDFS_PUT_SERVER_PATH = '/gridfs',
   SAFERPAY_WEBHOOK_PATH = '/payment/saferpay/webhook',
 } = process.env;
 
-// import './files/minio/minio-adapter';
-// import { minioHandler } from './files/minio/minio-webhook';
-
 export const defaultModules: Record<
   string,
   {
     configure: (params: ModuleInput<any>) => any;
   }
 > = {
+  ...baseModules,
+  ...cryptoModules,
   appleTransactions: {
     configure: configureAppleTransactionsModule,
   },
   saferpayTransactions: {
     configure: configureSaferpayTransactionsModule,
   },
-  gridfsFileUploads: {
-    configure: configureGridFSFileUploadModule,
-  },
-  cryptopay: {
-    configure: configureCryptopayModule,
-  },
 };
 
 export const connectDefaultPluginsToExpress4 = (
   app,
   { unchainedAPI }: { unchainedAPI: UnchainedCore },
 ) => {
-  app.use(GRIDFS_PUT_SERVER_PATH, gridfsHandler);
-  app.use(CRYPTOPAY_WEBHOOK_PATH, express.json(), cryptopayHandler);
+  connectBaseToExpress(app);
+  connectCryptoToExpress(app, unchainedAPI);
+
   app.use(STRIPE_WEBHOOK_PATH, express.raw({ type: 'application/json' }), stripeHandler);
   app.use(PFCHECKOUT_WEBHOOK_PATH, express.json(), postfinanceCheckoutHandler);
 
@@ -133,14 +85,5 @@ export const connectDefaultPluginsToExpress4 = (
   app.use(PAYREXX_WEBHOOK_PATH, express.json({ type: 'application/json' }), payrexxHandler);
   app.use(SAFERPAY_WEBHOOK_PATH, saferpayHandler);
 
-  // app.use(
-  //   MINIO_PUT_SERVER_PATH,
-  //   express.json({
-  //     strict: false,
-  //   }),
-  //   minioHandler
-  // );
-
-  configureExportToken(unchainedAPI);
   configureGenerateOrderAutoscheduling();
 };

package/src/presets/base-express.ts

@@ -0,0 +1,7 @@
+import { gridfsHandler } from '../files/gridfs/gridfs-webhook.js';
+
+const { GRIDFS_PUT_SERVER_PATH = '/gridfs' } = process.env;
+
+export default (app) => {
+  app.use(GRIDFS_PUT_SERVER_PATH, gridfsHandler);
+};

package/src/presets/base-modules.ts

@@ -0,0 +1,56 @@
+import { ModuleInput } from '@unchainedshop/core';
+
+// Delivery
+import '../delivery/post.js';
+
+// Payment
+import '../payment/invoice.js';
+
+// Warehousing
+import '../warehousing/store.js';
+
+// Pricing
+import '../pricing/free-payment.js';
+import '../pricing/free-delivery.js';
+import '../pricing/order-items.js';
+import '../pricing/order-discount.js';
+import '../pricing/order-delivery.js';
+import '../pricing/order-payment.js';
+import '../pricing/product-catalog-price.js';
+import '../pricing/product-discount.js';
+
+// Quotations
+import '../quotations/manual.js';
+
+// Enrollments
+import '../enrollments/licensed.js';
+
+// Event Queue
+import '../events/node-event-emitter.js';
+
+// Workers
+import '../worker/bulk-import.js';
+import '../worker/zombie-killer.js';
+import '../worker/message.js';
+import '../worker/external.js';
+import '../worker/http-request.js';
+import '../worker/heartbeat.js';
+import '../worker/email.js';
+import '../worker/error-notifications.js';
+
+// Asset Management
+import '../files/gridfs/gridfs-adapter.js';
+import { configureGridFSFileUploadModule } from '../files/gridfs/index.js';
+
+const modules: Record<
+  string,
+  {
+    configure: (params: ModuleInput<any>) => any;
+  }
+> = {
+  gridfsFileUploads: {
+    configure: configureGridFSFileUploadModule,
+  },
+};
+
+export default modules;

package/src/presets/countries/ch.ts

@@ -0,0 +1,3 @@
+import '../../delivery/pick-mup.js';
+import '../../pricing/product-swiss-tax.js';
+import '../../pricing/delivery-swiss-tax.js';

package/src/presets/crypto-express.ts

@@ -0,0 +1,12 @@
+import { UnchainedCore } from '@unchainedshop/core';
+import express from 'express';
+
+import { cryptopayHandler } from '../payment/cryptopay/index.js';
+import { configureExportToken } from '../worker/export-token.js';
+
+const { CRYPTOPAY_WEBHOOK_PATH = '/payment/cryptopay' } = process.env;
+
+export default (app, unchainedAPI: UnchainedCore) => {
+  app.use(CRYPTOPAY_WEBHOOK_PATH, express.json(), cryptopayHandler);
+  configureExportToken(unchainedAPI);
+};

package/src/presets/crypto-modules.ts

@@ -0,0 +1,23 @@
+import { ModuleInput } from '@unchainedshop/core';
+import { configureCryptopayModule } from '../payment/cryptopay/index.js';
+
+// Warehousing
+import '../warehousing/eth-minter.js';
+
+import '../pricing/product-price-rateconversion.js';
+import '../worker/update-ecb-rates.js';
+import '../worker/update-coinbase-rates.js';
+import '../worker/export-token.js';
+
+const modules: Record<
+  string,
+  {
+    configure: (params: ModuleInput<any>) => any;
+  }
+> = {
+  cryptopay: {
+    configure: configureCryptopayModule,
+  },
+};
+
+export default modules;

package/src/pricing/delivery-swiss-tax.ts

@@ -1,11 +1,8 @@
 import { DeliveryPricingAdapter, DeliveryPricingDirector } from '@unchainedshop/core-delivery';
-import {
-  DeliveryPricingRowCategory,
-  IDeliveryPricingAdapter,
-} from '@unchainedshop/types/delivery.pricing.js';
+import { DeliveryPricingRowCategory, IDeliveryPricingAdapter } from '@unchainedshop/core-delivery';
 
-import { Order } from '@unchainedshop/types/orders.js';
-import { DeliveryProvider } from '@unchainedshop/types/delivery.js';
+import { Order } from '@unchainedshop/core-orders';
+import { DeliveryProvider } from '@unchainedshop/core-delivery';
 import { SwissTaxCategories } from './tax/ch.js';
 
 const getTaxRate = ({ order, provider }: { order?: Order; provider?: DeliveryProvider }) => {

package/src/pricing/discount-100-off.ts

@@ -1,4 +1,4 @@
-import { IDiscountAdapter } from '@unchainedshop/types/discount.js';
+import { IDiscountAdapter } from '@unchainedshop/utils';
 import {
   OrderDiscountDirector,
   OrderDiscountAdapter,

package/src/pricing/discount-half-price-manual.ts

@@ -1,4 +1,4 @@
-import { IDiscountAdapter } from '@unchainedshop/types/discount.js';
+import { IDiscountAdapter } from '@unchainedshop/utils';
 import { OrderDiscountDirector, OrderDiscountAdapter } from '@unchainedshop/core-orders';
 import { ProductDiscountConfiguration } from '@unchainedshop/core-products';
 

package/src/pricing/discount-half-price.ts

@@ -1,4 +1,4 @@
-import { IDiscountAdapter } from '@unchainedshop/types/discount.js';
+import { IDiscountAdapter } from '@unchainedshop/utils';
 import { OrderDiscountDirector, OrderDiscountAdapter } from '@unchainedshop/core-orders';
 import { ProductDiscountConfiguration } from '@unchainedshop/core-products';
 

package/src/pricing/free-delivery.ts

@@ -1,5 +1,8 @@
-import { DeliveryPricingAdapter, DeliveryPricingDirector } from '@unchainedshop/core-delivery';
-import { IDeliveryPricingAdapter } from '@unchainedshop/types/delivery.pricing.js';
+import {
+  DeliveryPricingAdapter,
+  DeliveryPricingDirector,
+  IDeliveryPricingAdapter,
+} from '@unchainedshop/core-delivery';
 
 export const DeliveryFreePrice: IDeliveryPricingAdapter = {
   ...DeliveryPricingAdapter,

package/src/pricing/free-payment.ts

@@ -1,5 +1,8 @@
-import { PaymentPricingAdapter, PaymentPricingDirector } from '@unchainedshop/core-payment';
-import { IPaymentPricingAdapter } from '@unchainedshop/types/payments.pricing.js';
+import {
+  PaymentPricingAdapter,
+  PaymentPricingDirector,
+  IPaymentPricingAdapter,
+} from '@unchainedshop/core-payment';
 
 export const PaymentFreePrice: IPaymentPricingAdapter = {
   ...PaymentPricingAdapter,

package/src/pricing/order-delivery.ts

@@ -1,4 +1,4 @@
-import { IOrderPricingAdapter } from '@unchainedshop/types/orders.pricing.js';
+import { IOrderPricingAdapter } from '@unchainedshop/core-orders';
 import { OrderPricingDirector, OrderPricingAdapter } from '@unchainedshop/core-orders';
 
 export const OrderDelivery: IOrderPricingAdapter = {

package/src/pricing/order-discount.ts

@@ -1,4 +1,4 @@
-import { IOrderPricingAdapter, OrderPricingRowCategory } from '@unchainedshop/types/orders.pricing.js';
+import { IOrderPricingAdapter, OrderPricingRowCategory } from '@unchainedshop/core-orders';
 import {
   OrderPricingDirector,
   OrderPricingAdapter,

package/src/pricing/order-items-discount.ts

@@ -1,4 +1,4 @@
-import { IOrderPricingAdapter, OrderPricingRowCategory } from '@unchainedshop/types/orders.pricing.js';
+import { IOrderPricingAdapter, OrderPricingRowCategory } from '@unchainedshop/core-orders';
 import {
   OrderPricingDirector,
   OrderPricingAdapter,

package/src/pricing/order-items.ts

@@ -1,4 +1,4 @@
-import { IOrderPricingAdapter } from '@unchainedshop/types/orders.pricing.js';
+import { IOrderPricingAdapter } from '@unchainedshop/core-orders';
 import { OrderPricingDirector, OrderPricingAdapter } from '@unchainedshop/core-orders';
 
 const OrderItems: IOrderPricingAdapter = {

package/src/pricing/order-payment.ts

@@ -1,4 +1,4 @@
-import { IOrderPricingAdapter } from '@unchainedshop/types/orders.pricing.js';
+import { IOrderPricingAdapter } from '@unchainedshop/core-orders';
 import { OrderPricingDirector, OrderPricingAdapter } from '@unchainedshop/core-orders';
 
 const OrderPayment: IOrderPricingAdapter = {

package/src/pricing/order-round.ts

@@ -1,5 +1,5 @@
 import { OrderPricingAdapter, OrderPricingDirector } from '@unchainedshop/core-orders';
-import { IOrderPricingAdapter, OrderPricingRowCategory } from '@unchainedshop/types/orders.pricing.js';
+import { IOrderPricingAdapter, OrderPricingRowCategory } from '@unchainedshop/core-orders';
 
 interface PriceRoundSettings {
   defaultPrecision: number;

package/src/pricing/product-catalog-price.ts

@@ -1,4 +1,4 @@
-import { IProductPricingAdapter } from '@unchainedshop/types/products.pricing.js';
+import { IProductPricingAdapter } from '@unchainedshop/core-products';
 import { ProductPricingDirector, ProductPricingAdapter } from '@unchainedshop/core-products';
 import { resolveBestCurrency } from '@unchainedshop/utils';
 import memoizee from 'memoizee';

package/src/pricing/product-discount.ts

@@ -1,8 +1,5 @@
-import type { Discount } from '@unchainedshop/types/discount.js';
-import {
-  IProductPricingAdapter,
-  ProductPricingRowCategory,
-} from '@unchainedshop/types/products.pricing.js';
+import type { Discount } from '@unchainedshop/utils';
+import { IProductPricingAdapter, ProductPricingRowCategory } from '@unchainedshop/core-products';
 import {
   ProductPricingDirector,
   ProductPricingAdapter,

package/src/pricing/product-price-rateconversion.ts

@@ -1,4 +1,4 @@
-import { IProductPricingAdapter } from '@unchainedshop/types/products.pricing.js';
+import { IProductPricingAdapter } from '@unchainedshop/core-products';
 import { ProductPricingDirector, ProductPricingAdapter } from '@unchainedshop/core-products';
 
 export const ProductPriceRateConversion: IProductPricingAdapter = {

package/src/pricing/product-round.ts

@@ -1,4 +1,4 @@
-import { IProductPricingAdapter } from '@unchainedshop/types/products.pricing.js';
+import { IProductPricingAdapter } from '@unchainedshop/core-products';
 import { ProductPricingAdapter, ProductPricingDirector } from '@unchainedshop/core-products';
 
 interface PriceRoundSettings {

package/src/pricing/product-swiss-tax.test.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import { getTaxRate, isDeliveryAddressInSwitzerland } from './product-swiss-tax.js';
 
 describe("ProductSwissTax", () => {