Merge branch 'master' into minor

CHANGELOG.md

@@ -1,32 +1,12 @@
-## 3.2.0 (2025-03-27)
+## <small>3.1.8 (2025-03-31)</small>
 
 
 #### Fixes
 
-* **admin-ui** Fix build error ([fbbcc3e](https://github.com/vendure-ecommerce/vendure/commit/fbbcc3e))
-* **core** Avoid variant options combination check on updateProductVariant mutation (#3361) ([c820f42](https://github.com/vendure-ecommerce/vendure/commit/c820f42)), closes [#3361](https://github.com/vendure-ecommerce/vendure/issues/3361)
-* **core** Fix progress reporting for collection filters job ([3976148](https://github.com/vendure-ecommerce/vendure/commit/3976148))
-* **core** Use correct precision for CacheItem.expiresAt ([12e2db0](https://github.com/vendure-ecommerce/vendure/commit/12e2db0))
+* **admin-ui** Fix product variant list location (#3410) ([5082cc9](https://github.com/vendure-ecommerce/vendure/commit/5082cc9)), closes [#3410](https://github.com/vendure-ecommerce/vendure/issues/3410)
+* **core** Eligible payment methods must be enabled (#3406) ([45852ea](https://github.com/vendure-ecommerce/vendure/commit/45852ea)), closes [#3406](https://github.com/vendure-ecommerce/vendure/issues/3406)
+* **job-queue-plugin** Fix ignored values from BullMQ workerOptions (#3440) ([a9aea24](https://github.com/vendure-ecommerce/vendure/commit/a9aea24)), closes [#3440](https://github.com/vendure-ecommerce/vendure/issues/3440)
 
-#### Features
-
-* **common** Add exports field to package.json for module resolution ([5623c2b](https://github.com/vendure-ecommerce/vendure/commit/5623c2b))
-* **core** Add updateProductVariant mutation ([0b854b4](https://github.com/vendure-ecommerce/vendure/commit/0b854b4))
-* **core** Add verification token strategy (#3294) ([9375ba2](https://github.com/vendure-ecommerce/vendure/commit/9375ba2)), closes [#3294](https://github.com/vendure-ecommerce/vendure/issues/3294)
-* **harden-plugin** Allow skipping complexity check in Harden Plugin (#3340) ([0bef00b](https://github.com/vendure-ecommerce/vendure/commit/0bef00b)), closes [#3340](https://github.com/vendure-ecommerce/vendure/issues/3340)
-* **job-queue-plugin** Add support for job options  Priority ([90b5e05](https://github.com/vendure-ecommerce/vendure/commit/90b5e05))
-
-#### Perf
-
-* **core** Remove duplicated calls to promotion checks ([e3508f3](https://github.com/vendure-ecommerce/vendure/commit/e3508f3))
-
-
-### BREAKING CHANGE
-
-* If you are using the DefaultCachePlugin, then
-you should generate a migration that adds `precision(3)` to the
-`expiresAt` column. This will only affect cache records so no prod
-data will be affected by it.
 ## <small>3.1.7 (2025-03-06)</small>
 
 

README.md

@@ -95,7 +95,7 @@ The first step is to populate the dev server with some test data:
 ```bash
 cd packages/dev-server
 
-[DB=mysql|postres|sqlite] npm run populate
+[DB=mysql|postgres|sqlite] npm run populate
 ```
 
 If you do not specify the `DB` variable, it will default to "mysql". If you specifically want to develop against Postgres,

docs/docs/guides/developer-guide/worker-job-queue/index.mdx

@@ -326,8 +326,9 @@ export class ProductVideoPlugin {}
 
 Sometimes you need to pass the [RequestContext object](/reference/typescript-api/request/request-context) to the `process` function of a job, since `ctx` is required by many Vendure
 service methods that you may be using inside your `process` function. However, the `RequestContext` object itself is not serializable,
-so it cannot be passed directly to the `JobQueue.add()` method. Instead, you can serialize the `RequestContext` using the [`RequestContext.serialize()`
-method](/reference/typescript-api/request/request-context/#serialize), and then deserialize it in the `process` function using the static `deserialize` method:
+so it cannot be passed directly to the `JobQueue.add()` method. Instead, you can serialize the `RequestContext` using the [`ctx.serialize()` method](/reference/typescript-api/request/request-context/#serialize),
+ and then deserialize it in the `process` function using the static `deserialize` method.
+
 
 ```ts
 import { Injectable, OnModuleInit } from '@nestjs/common';
@@ -358,7 +359,7 @@ class ProductExportService implements OnModuleInit {
 
     exportAllProducts(ctx: RequestContext) {
         // highlight-next-line
-        return this.jobQueue.add({ ctx: RequestContext.serialize(ctx) });
+        return this.jobQueue.add({ ctx: ctx.serialize() });
     }
 }
 ```
@@ -468,7 +469,7 @@ class ProductExportService implements OnModuleInit {
     }
 
     exportAllProducts(ctx: RequestContext) {
-        return this.jobQueue.add({ ctx: RequestContext.serialize(ctx) });
+        return this.jobQueue.add({ ctx: ctx.serialize() });
     }
 }
 ```

lerna.json

@@ -1,6 +1,6 @@
 {
     "packages": ["packages/*"],
-    "version": "3.1.7",
+    "version": "3.1.8",
     "npmClient": "npm",
     "command": {
         "version": {

packages/admin-ui-plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/admin-ui-plugin",
-    "version": "3.1.7",
+    "version": "3.1.8",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "files": [
@@ -21,9 +21,9 @@
     "devDependencies": {
         "@types/express": "^4.17.21",
         "@types/fs-extra": "^11.0.4",
-        "@vendure/admin-ui": "^3.1.7",
-        "@vendure/common": "^3.1.7",
-        "@vendure/core": "^3.1.7",
+        "@vendure/admin-ui": "^3.1.8",
+        "@vendure/common": "^3.1.8",
+        "@vendure/core": "^3.1.8",
         "express": "^4.18.3",
         "rimraf": "^5.0.5",
         "typescript": "5.8.2"

packages/admin-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vendure/admin-ui",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "license": "GPL-3.0-or-later",
   "scripts": {
     "ng": "ng",

packages/admin-ui/src/lib/core/src/common/version.ts

@@ -1,2 +1,2 @@
 // Auto-generated by the set-version.js script.
-export const ADMIN_UI_VERSION = '3.1.7';
+export const ADMIN_UI_VERSION = '3.1.8';

packages/asset-server-plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/asset-server-plugin",
-    "version": "3.1.7",
+    "version": "3.1.8",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "files": [
@@ -26,8 +26,8 @@
         "@types/express": "^4.17.21",
         "@types/fs-extra": "^11.0.4",
         "@types/node-fetch": "^2.6.11",
-        "@vendure/common": "^3.1.7",
-        "@vendure/core": "^3.1.7",
+        "@vendure/common": "^3.1.8",
+        "@vendure/core": "^3.1.8",
         "express": "^4.18.3",
         "node-fetch": "^2.7.0",
         "rimraf": "^5.0.5",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/cli",
-    "version": "3.1.7",
+    "version": "3.1.8",
     "description": "A modern, headless ecommerce framework",
     "repository": {
         "type": "git",
@@ -35,7 +35,7 @@
     ],
     "dependencies": {
         "@clack/prompts": "^0.7.0",
-        "@vendure/common": "^3.1.7",
+        "@vendure/common": "^3.1.8",
         "change-case": "^4.1.2",
         "commander": "^11.0.0",
         "dotenv": "^16.4.5",
@@ -46,7 +46,7 @@
         "tsconfig-paths": "^4.2.0"
     },
     "devDependencies": {
-        "@vendure/core": "^3.1.7",
+        "@vendure/core": "^3.1.8",
         "typescript": "5.8.2"
     }
 }

packages/common/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/common",
-    "version": "3.1.7",
+    "version": "3.1.8",
     "main": "index.js",
     "license": "GPL-3.0-or-later",
     "scripts": {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/core",
-    "version": "3.1.7",
+    "version": "3.1.8",
     "description": "A modern, headless ecommerce framework",
     "repository": {
         "type": "git",
@@ -49,7 +49,7 @@
         "@nestjs/platform-express": "~11.0.12",
         "@nestjs/terminus": "~11.0.0",
         "@nestjs/typeorm": "~11.0.0",
-        "@vendure/common": "^3.1.7",
+        "@vendure/common": "^3.1.8",
         "bcrypt": "^5.1.1",
         "body-parser": "^1.20.2",
         "cookie-session": "^2.1.0",

packages/core/src/service/services/payment-method.service.ts

@@ -307,6 +307,7 @@ export class PaymentMethodService {
             .leftJoin('method.channels', 'channel')
             .where('method.code = :code', { code: method })
             .andWhere('channel.id = :channelId', { channelId: ctx.channelId })
+            .andWhere('method.enabled IS true')
             .getOne();
         if (!paymentMethod) {
             throw new UserInputError('error.payment-method-not-found', { method });

packages/create/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/create",
-    "version": "3.1.7",
+    "version": "3.1.8",
     "license": "GPL-3.0-or-later",
     "bin": {
         "create": "./index.js"
@@ -27,14 +27,14 @@
         "@types/fs-extra": "^11.0.4",
         "@types/handlebars": "^4.1.0",
         "@types/semver": "^7.5.8",
-        "@vendure/core": "^3.1.7",
+        "@vendure/core": "^3.1.8",
         "rimraf": "^5.0.5",
         "ts-node": "^10.9.2",
         "typescript": "5.8.2"
     },
     "dependencies": {
         "@clack/prompts": "^0.7.0",
-        "@vendure/common": "^3.1.7",
+        "@vendure/common": "^3.1.8",
         "commander": "^11.0.0",
         "cross-spawn": "^7.0.3",
         "fs-extra": "^11.2.0",

packages/dev-server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dev-server",
-    "version": "3.1.7",
+    "version": "3.1.8",
     "main": "index.js",
     "license": "GPL-3.0-or-later",
     "private": true,
@@ -25,8 +25,8 @@
         "typescript": "5.8.2"
     },
     "devDependencies": {
-        "@vendure/testing": "^3.1.7",
-        "@vendure/ui-devkit": "^3.1.7",
+        "@vendure/testing": "^3.1.8",
+        "@vendure/ui-devkit": "^3.1.8",
         "commander": "^12.0.0",
         "concurrently": "^8.2.2",
         "csv-stringify": "^6.4.6",

packages/elasticsearch-plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/elasticsearch-plugin",
-    "version": "3.1.7",
+    "version": "3.1.8",
     "license": "GPL-3.0-or-later",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -26,8 +26,8 @@
         "fast-deep-equal": "^3.1.3"
     },
     "devDependencies": {
-        "@vendure/common": "^3.1.7",
-        "@vendure/core": "^3.1.7",
+        "@vendure/common": "^3.1.8",
+        "@vendure/core": "^3.1.8",
         "rimraf": "^5.0.5",
         "typescript": "5.8.2"
     }

packages/email-plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/email-plugin",
-    "version": "3.1.7",
+    "version": "3.1.8",
     "license": "GPL-3.0-or-later",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -34,8 +34,8 @@
         "@types/express": "^4.17.21",
         "@types/fs-extra": "^11.0.4",
         "@types/mjml": "^4.7.4",
-        "@vendure/common": "^3.1.7",
-        "@vendure/core": "^3.1.7",
+        "@vendure/common": "^3.1.8",
+        "@vendure/core": "^3.1.8",
         "rimraf": "^5.0.5",
         "typescript": "5.8.2"
     }

packages/harden-plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/harden-plugin",
-    "version": "3.1.7",
+    "version": "3.1.8",
     "license": "GPL-3.0-or-later",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -21,7 +21,7 @@
         "graphql-query-complexity": "^0.12.0"
     },
     "devDependencies": {
-        "@vendure/common": "^3.1.7",
-        "@vendure/core": "^3.1.7"
+        "@vendure/common": "^3.1.8",
+        "@vendure/core": "^3.1.8"
     }
 }

packages/job-queue-plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/job-queue-plugin",
-    "version": "3.1.7",
+    "version": "3.1.8",
     "license": "GPL-3.0-or-later",
     "main": "package/index.js",
     "types": "package/index.d.ts",
@@ -23,8 +23,8 @@
     },
     "devDependencies": {
         "@google-cloud/pubsub": "^2.8.0",
-        "@vendure/common": "^3.1.7",
-        "@vendure/core": "^3.1.7",
+        "@vendure/common": "^3.1.8",
+        "@vendure/core": "^3.1.8",
         "bullmq": "^5.4.2",
         "ioredis": "^5.3.2",
         "rimraf": "^5.0.5",

packages/job-queue-plugin/src/bullmq/bullmq-job-queue-strategy.ts

@@ -57,6 +57,7 @@ export class BullMQJobQueueStrategy implements InspectableJobQueueStrategy {
         this.options = {
             ...options,
             workerOptions: {
+                ...options.workerOptions,
                 removeOnComplete: options.workerOptions?.removeOnComplete ?? {
                     age: 60 * 60 * 24 * 30,
                     count: 5000,

packages/payments-plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/payments-plugin",
-    "version": "3.1.7",
+    "version": "3.1.8",
     "license": "GPL-3.0-or-later",
     "main": "package/index.js",
     "types": "package/index.d.ts",
@@ -46,9 +46,9 @@
         "@mollie/api-client": "^3.7.0",
         "@types/braintree": "^3.3.11",
         "@types/localtunnel": "2.0.4",
-        "@vendure/common": "^3.1.7",
-        "@vendure/core": "^3.1.7",
-        "@vendure/testing": "^3.1.7",
+        "@vendure/common": "^3.1.8",
+        "@vendure/core": "^3.1.8",
+        "@vendure/testing": "^3.1.8",
         "braintree": "^3.22.0",
         "localtunnel": "2.0.2",
         "nock": "^13.1.4",

packages/sentry-plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/sentry-plugin",
-    "version": "3.1.7",
+    "version": "3.1.8",
     "license": "GPL-3.0-or-later",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -22,7 +22,7 @@
     },
     "devDependencies": {
         "@sentry/node": "^7.106.1",
-        "@vendure/common": "^3.1.7",
-        "@vendure/core": "^3.1.7"
+        "@vendure/common": "^3.1.8",
+        "@vendure/core": "^3.1.8"
     }
 }

packages/stellate-plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/stellate-plugin",
-    "version": "3.1.7",
+    "version": "3.1.8",
     "license": "GPL-3.0-or-later",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -21,7 +21,7 @@
         "node-fetch": "^2.7.0"
     },
     "devDependencies": {
-        "@vendure/common": "^3.1.7",
-        "@vendure/core": "^3.1.7"
+        "@vendure/common": "^3.1.8",
+        "@vendure/core": "^3.1.8"
     }
 }

packages/testing/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/testing",
-    "version": "3.1.7",
+    "version": "3.1.8",
     "description": "End-to-end testing tools for Vendure projects",
     "keywords": [
         "vendure",
@@ -38,7 +38,7 @@
     },
     "dependencies": {
         "@graphql-typed-document-node/core": "^3.2.0",
-        "@vendure/common": "^3.1.7",
+        "@vendure/common": "^3.1.8",
         "faker": "^4.1.0",
         "form-data": "^4.0.0",
         "graphql": "^16.10.0",
@@ -51,7 +51,7 @@
         "@types/mysql": "^2.15.26",
         "@types/node-fetch": "^2.6.4",
         "@types/pg": "^8.11.2",
-        "@vendure/core": "^3.1.7",
+        "@vendure/core": "^3.1.8",
         "mysql": "^2.18.1",
         "pg": "^8.11.3",
         "rimraf": "^5.0.5",

packages/ui-devkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/ui-devkit",
-    "version": "3.1.7",
+    "version": "3.1.8",
     "description": "A library for authoring Vendure Admin UI extensions",
     "keywords": [
         "vendure",
@@ -52,7 +52,7 @@
         "@rollup/plugin-node-resolve": "^15.2.3",
         "@rollup/plugin-terser": "^0.4.4",
         "@types/fs-extra": "^11.0.4",
-        "@vendure/core": "^3.1.7",
+        "@vendure/core": "^3.1.8",
         "react": "^19.0.0",
         "react-dom": "^19.0.0",
         "rimraf": "^5.0.5",