Merge pull request #553 from Pinelab-studio/feat/vendure-3.1.1-update

Update Vendure to 3.1.1
Pinelab-studio · Dec 20, 2024 · 9c5bcd5 · 9c5bcd5
2 parents cfdcb87 + 11bca75
commit 9c5bcd5
Show file tree

Hide file tree

Showing 78 changed files with 763 additions and 325 deletions.
diff --git a/package.json b/package.json
@@ -32,14 +32,14 @@
     "@nestjs/cli": "8.2.4",
     "@swc/core": "1.4.6",
     "@types/localtunnel": "^2.0.4",
-    "@vendure/admin-ui-plugin": "2.2.6",
-    "@vendure/asset-server-plugin": "2.2.6",
-    "@vendure/cli": "^3.0.0",
-    "@vendure/core": "2.2.6",
-    "@vendure/email-plugin": "2.2.6",
-    "@vendure/payments-plugin": "2.2.6",
-    "@vendure/testing": "2.2.6",
-    "@vendure/ui-devkit": "2.2.6",
+    "@vendure/admin-ui-plugin": "3.1.1",
+    "@vendure/asset-server-plugin": "3.1.1",
+    "@vendure/cli": "3.1.1",
+    "@vendure/core": "3.1.1",
+    "@vendure/email-plugin": "3.1.1",
+    "@vendure/payments-plugin": "3.1.1",
+    "@vendure/testing": "3.1.1",
+    "@vendure/ui-devkit": "3.1.1",
     "aws-sdk": "2.1099.0",
     "copyfiles": "2.4.1",
     "eslint": "^8.57.0",

diff --git a/packages/vendure-plugin-accept-blue/CHANGELOG.md b/packages/vendure-plugin-accept-blue/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 1.9.1 (2024-12-04)
 
 - Recurring amounts divided by 100

diff --git a/packages/vendure-plugin-accept-blue/package.json b/packages/vendure-plugin-accept-blue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-accept-blue",
-  "version": "1.9.1",
+  "version": "2.0.0",
   "description": "Vendure plugin for creating subscriptions with the Accept Blue platform",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-admin-social-auth/CHANGELOG.md b/packages/vendure-plugin-admin-social-auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.2.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 1.1.2 (2024-10-10)
 
 - Added privacy policy to the login page

diff --git a/packages/vendure-plugin-admin-social-auth/package.json b/packages/vendure-plugin-admin-social-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-admin-social-auth",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "Plugin to allow authentication for administrators with socials like Google",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "repository": "https://github.com/vendure-ecommerce/plugin-template",

diff --git a/packages/vendure-plugin-admin-ui-helpers/CHANGELOG.md b/packages/vendure-plugin-admin-ui-helpers/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.3.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 1.2.1 (2024-06-21)
 
 - Disable buttons on the `ArrangingPayment` state and allow vendure error to bubble by using a `Promise` instead of an `Observable`

diff --git a/packages/vendure-plugin-admin-ui-helpers/package.json b/packages/vendure-plugin-admin-ui-helpers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-admin-ui-helpers",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Vendure plugin for various admin ui helpers. Cancel button, complete order button etc.",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-anonymized-order/CHANGELOG.md b/packages/vendure-plugin-anonymized-order/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.3.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 1.2.1 (2024-08-04)
 
 - Update compatibility range (#480)

diff --git a/packages/vendure-plugin-anonymized-order/package.json b/packages/vendure-plugin-anonymized-order/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-anonymized-order",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "This plugin facilitates the retrieval of anonymized customer orders",
   "author": "Surafel Tariku <surafelmelese09@gmail.com>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-campaign-tracker/CHANGELOG.md b/packages/vendure-plugin-campaign-tracker/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.1.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 0.0.4 (2024-11-01)
 
 - Only fetch orders with connected campaigns for calculating revenue

diff --git a/packages/vendure-plugin-campaign-tracker/package.json b/packages/vendure-plugin-campaign-tracker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-campaign-tracker",
-  "version": "0.0.4",
+  "version": "0.1.0",
   "description": "Compare different campaign and ads sources with server side revenue tracking.",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-coinbase/CHANGELOG.md b/packages/vendure-plugin-coinbase/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.3.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 1.2.1 (2024-08-04)
 
 - Update compatibility range (#480)

diff --git a/packages/vendure-plugin-coinbase/package.json b/packages/vendure-plugin-coinbase/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-coinbase",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Vendure plugin for Coinbase payments",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-customer-managed-groups/CHANGELOG.md b/packages/vendure-plugin-customer-managed-groups/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.5.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 1.4.1 (2024-08-04)
 
 - Update compatibility range (#480)

diff --git a/packages/vendure-plugin-customer-managed-groups/package.json b/packages/vendure-plugin-customer-managed-groups/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-customer-managed-groups",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "This plugin allows customer groups to have 'Group admins', that are allowed to fetch placed orders for everyone in the group.",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-dutch-postalcode/CHANGELOG.md b/packages/vendure-plugin-dutch-postalcode/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.3.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 1.2.1 (2024-08-04)
 
 - Update compatibility range (#480)

diff --git a/packages/vendure-plugin-dutch-postalcode/package.json b/packages/vendure-plugin-dutch-postalcode/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-dutch-postalcode",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Vendure plugin for retrieving Dutch addresses by postal code via postcode.tech",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-e-boekhouden/CHANGELOG.md b/packages/vendure-plugin-e-boekhouden/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.3.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 1.2.1 (2024-08-04)
 
 - Update compatibility range (#480)

diff --git a/packages/vendure-plugin-e-boekhouden/package.json b/packages/vendure-plugin-e-boekhouden/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-e-boekhouden",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Vendure plugin for integration with the e-boekhouden accounting platform",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-facet-suggestions/CHANGELOG.md b/packages/vendure-plugin-facet-suggestions/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.2.0 (2024-12-20)
+
+- Update Vendure to 3.1.1
+
 # 1.1.2 (2024-12-20)
 
 - Fix to correctly save assets with Vendure V3.1

diff --git a/packages/vendure-plugin-facet-suggestions/package.json b/packages/vendure-plugin-facet-suggestions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-facet-suggestions",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "A vendure plugin that allows you to define suggested facets for all products, or suggested facets based on other facets.",
   "author": "Surafel Tariku <surafelmelese09@gmail.com>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-frequently-bought-together/CHANGELOG.md b/packages/vendure-plugin-frequently-bought-together/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.1.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 1.0.0 (2024-12-12)
 
 - Implemented FPGrowth algorithm for defining frequently bought together relations

diff --git a/packages/vendure-plugin-frequently-bought-together/package.json b/packages/vendure-plugin-frequently-bought-together/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vendure-hub/pinelab-frequently-bought-together-plugin",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Increase average order value by suggesting frequently bought together products based on past orders. Also known as related products or product recommendations.",
   "keywords": [
     "frequently bought together",

diff --git a/packages/vendure-plugin-goedgepickt/CHANGELOG.md b/packages/vendure-plugin-goedgepickt/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.4.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 1.3.2 (2024-11-05)
 
 - `orderPlacedAt` field should not be mandatory to push to Picqer

diff --git a/packages/vendure-plugin-goedgepickt/package.json b/packages/vendure-plugin-goedgepickt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-goedgepickt",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "description": "Vendure plugin for integration with the Goedgepickt order picking platform",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-google-cloud-tasks/CHANGELOG.md b/packages/vendure-plugin-google-cloud-tasks/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.8.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 1.7.1 (2024-08-04)
 
 - Update compatibility range (#480)

diff --git a/packages/vendure-plugin-google-cloud-tasks/package.json b/packages/vendure-plugin-google-cloud-tasks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-google-cloud-tasks",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "description": "Vendure plugin for using worker jobs with Google Cloud Tasks",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-google-storage-assets/CHANGELOG.md b/packages/vendure-plugin-google-storage-assets/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.3.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 1.2.2 (2024-10-31)
 
 - Use asset server for admin with Vendure V3 support

diff --git a/packages/vendure-plugin-google-storage-assets/package.json b/packages/vendure-plugin-google-storage-assets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-google-storage-assets",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "Vendure plugin for uploading assets to Google storage",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-invoices/CHANGELOG.md b/packages/vendure-plugin-invoices/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 4.2.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 4.1.1 (2024-11-12)
 
 - Better error message extraction from Xero API response

diff --git a/packages/vendure-plugin-invoices/package.json b/packages/vendure-plugin-invoices/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vendure-hub/pinelab-invoice-plugin",
-  "version": "4.1.1",
+  "version": "4.2.0",
   "description": "Vendure plugin for PDF invoice generation",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-klaviyo/CHANGELOG.md b/packages/vendure-plugin-klaviyo/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.5.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 1.4.0 (2024-12-13)
 
 - Include `klaviyoCheckoutStarted` mutation to be able to use abandoned cart email flows

diff --git a/packages/vendure-plugin-klaviyo/package.json b/packages/vendure-plugin-klaviyo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-klaviyo",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "An extensible plugin for sending placed orders to the Klaviyo marketing platform.",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-limited-products/CHANGELOG.md b/packages/vendure-plugin-limited-products/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 3.1.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 3.0.1 (2024-08-04)
 
 - Update compatibility range (#480)

diff --git a/packages/vendure-plugin-limited-products/package.json b/packages/vendure-plugin-limited-products/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-limited-products",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "description": "Limit the maximum quantity of a product that can be ordered at a time, or require that purchases be made in bulk quantities, such as in multiples of 6 items.",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-limited-products/src/api/add-item-override.resolver.ts b/packages/vendure-plugin-limited-products/src/api/add-item-override.resolver.ts
@@ -12,6 +12,8 @@ import {
   Injector,
   OrderLine,
   Permission,
+  RelationPaths,
+  Relations,
   RequestContext,
   Transaction,
   UserInputError,
@@ -40,11 +42,13 @@ export class AddItemOverrideResolver {
   @Allow(Permission.UpdateOrder, Permission.Owner)
   async addItemToOrder(
     @Ctx() ctx: RequestContext,
-    @Args() args: MutationAddItemToOrderArgs
+    @Args() args: MutationAddItemToOrderArgs,
+    @Relations({ entity: Order, omit: ['aggregateOrder', 'sellerOrders'] })
+    relations: RelationPaths<Order>
   ): Promise<ErrorResultUnion<UpdateOrderItemsResult, Order>> {
     const result = await this.injector
       .get(ShopOrderResolver)
-      .addItemToOrder(ctx, args);
+      .addItemToOrder(ctx, args, relations);
     if (!(result as Order).code) {
       return result;
     }
@@ -63,11 +67,13 @@ export class AddItemOverrideResolver {
   @Allow(Permission.UpdateOrder, Permission.Owner)
   async adjustOrderLine(
     @Ctx() ctx: RequestContext,
-    @Args() args: MutationAdjustOrderLineArgs
+    @Args() args: MutationAdjustOrderLineArgs,
+    @Relations({ entity: Order, omit: ['aggregateOrder', 'sellerOrders'] })
+    relations: RelationPaths<Order>
   ): Promise<ErrorResultUnion<UpdateOrderItemsResult, Order>> {
     const result = await this.injector
       .get(ShopOrderResolver)
-      .adjustOrderLine(ctx, args);
+      .adjustOrderLine(ctx, args, relations);
     if (!(result as Order).code) {
       return result;
     }
@@ -86,6 +92,9 @@ export class AddItemOverrideResolver {
     ctx: RequestContext,
     orderLine: OrderLine
   ): Promise<void> {
+    await this.entityHydrator.hydrate(ctx, orderLine, {
+      relations: ['productVariant'],
+    });
     await this.entityHydrator.hydrate(ctx, orderLine.productVariant, {
       relations: ['product'],
     });

diff --git a/packages/vendure-plugin-metrics/CHANGELOG.md b/packages/vendure-plugin-metrics/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.7.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 1.6.1 (2024-12-18)
 
 - Fixed chart text color to display correctly in dark mode.

diff --git a/packages/vendure-plugin-metrics/package.json b/packages/vendure-plugin-metrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-metrics",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "description": "Vendure plugin measuring and visualizing e-commerce metrics",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-modify-customer-orders/CHANGELOG.md b/packages/vendure-plugin-modify-customer-orders/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.4.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 1.3.1 (2024-08-04)
 
 - Update compatibility range (#480)

diff --git a/packages/vendure-plugin-modify-customer-orders/package.json b/packages/vendure-plugin-modify-customer-orders/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-modify-customer-orders",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "Vendure plugin for converting Active orders to Draft",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-multiserver-db-sessioncache/CHANGELOG.md b/packages/vendure-plugin-multiserver-db-sessioncache/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.3.0 (2024-12-19)
+
+- Update Vendure to 3.1.1
+
 # 1.2.1 (2024-08-04)
 
 - Update compatibility range (#480)

diff --git a/packages/vendure-plugin-multiserver-db-sessioncache/package.json b/packages/vendure-plugin-multiserver-db-sessioncache/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@pinelab/vendure-plugin-multiserver-db-sessioncache",
   "description": "An implementation of Vendure's SessionCacheStrategy that caches session in the database",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "author": "Surafel Melese Tariku <surafelmelese09@gmail.com>",
   "homepage": "https://pinelab-plugins.com/",
   "repository": "https://github.com/Pinelab-studio/pinelab-vendure-plugins",