chore: Fix tests & lockfile after merge

package-lock.json

@@ -51212,7 +51212,7 @@
     },
     "packages/admin-ui": {
       "name": "@vendure/admin-ui",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@angular/animations": "^19.2.4",
@@ -51235,7 +51235,7 @@
         "@ng-select/ng-select": "^14.2.6",
         "@ngx-translate/core": "^16.0.4",
         "@ngx-translate/http-loader": "^16.0.1",
-        "@vendure/common": "3.5.2",
+        "@vendure/common": "3.5.3",
         "@webcomponents/custom-elements": "^1.6.0",
         "apollo-angular": "^10.0.3",
         "apollo-upload-client": "^18.0.1",
@@ -51306,7 +51306,7 @@
     },
     "packages/admin-ui-plugin": {
       "name": "@vendure/admin-ui-plugin",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "date-fns": "^4.0.0",
@@ -51316,9 +51316,9 @@
       "devDependencies": {
         "@types/express": "^5.0.1",
         "@types/fs-extra": "^11.0.4",
-        "@vendure/admin-ui": "3.5.2",
-        "@vendure/common": "3.5.2",
-        "@vendure/core": "3.5.2",
+        "@vendure/admin-ui": "3.5.3",
+        "@vendure/common": "3.5.3",
+        "@vendure/core": "3.5.3",
         "express": "^5.1.0",
         "rimraf": "^5.0.5",
         "typescript": "5.8.2"
@@ -51346,7 +51346,7 @@
     },
     "packages/asset-server-plugin": {
       "name": "@vendure/asset-server-plugin",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "file-type": "^19.0.0",
@@ -51359,8 +51359,8 @@
         "@types/express": "^5.0.1",
         "@types/fs-extra": "^11.0.4",
         "@types/node-fetch": "^2.6.11",
-        "@vendure/common": "3.5.2",
-        "@vendure/core": "3.5.2",
+        "@vendure/common": "3.5.3",
+        "@vendure/core": "3.5.3",
         "express": "^5.1.0",
         "node-fetch": "^2.7.0",
         "rimraf": "^5.0.5",
@@ -51435,11 +51435,11 @@
     },
     "packages/cli": {
       "name": "@vendure/cli",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@clack/prompts": "^0.7.0",
-        "@vendure/common": "3.5.2",
+        "@vendure/common": "3.5.3",
         "change-case": "^4.1.2",
         "commander": "^11.0.0",
         "dotenv": "^16.4.5",
@@ -51454,8 +51454,8 @@
         "vendure": "dist/cli.js"
       },
       "devDependencies": {
-        "@vendure/core": "3.5.2",
-        "@vendure/testing": "3.5.2",
+        "@vendure/core": "3.5.3",
+        "@vendure/testing": "3.5.3",
         "cross-env": "^7.0.3",
         "typescript": "5.8.2"
       },
@@ -51477,7 +51477,7 @@
     },
     "packages/common": {
       "name": "@vendure/common",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "devDependencies": {
         "rimraf": "^5.0.5",
@@ -51489,7 +51489,7 @@
     },
     "packages/core": {
       "name": "@vendure/core",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@apollo/server": "^4.12.2",
@@ -51501,7 +51501,7 @@
         "@nestjs/platform-express": "^11.0.12",
         "@nestjs/terminus": "^11.0.0",
         "@nestjs/typeorm": "^11.0.0",
-        "@vendure/common": "3.5.2",
+        "@vendure/common": "3.5.3",
         "bcrypt": "^5.1.1",
         "body-parser": "^1.20.2",
         "cookie-session": "^2.1.0",
@@ -51590,11 +51590,11 @@
     },
     "packages/create": {
       "name": "@vendure/create",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@clack/prompts": "^0.11.0",
-        "@vendure/common": "3.5.2",
+        "@vendure/common": "3.5.3",
         "commander": "^14.0.1",
         "cross-spawn": "^7.0.6",
         "fs-extra": "^11.2.0",
@@ -51613,7 +51613,7 @@
         "@types/fs-extra": "^11.0.4",
         "@types/handlebars": "^4.1.0",
         "@types/semver": "^7.5.8",
-        "@vendure/core": "3.5.2",
+        "@vendure/core": "3.5.3",
         "rimraf": "^5.0.5",
         "ts-node": "^10.9.2",
         "typescript": "5.8.2"
@@ -51672,7 +51672,7 @@
     },
     "packages/dashboard": {
       "name": "@vendure/dashboard",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "dependencies": {
         "@babel/core": "^7.26.0",
         "@babel/preset-react": "^7.26.3",
@@ -51774,8 +51774,8 @@
         "@storybook/addon-vitest": "^10.0.0-beta.9",
         "@storybook/react-vite": "^10.0.0-beta.9",
         "@types/node": "^22.13.4",
-        "@vendure/common": "3.5.2",
-        "@vendure/core": "3.5.2",
+        "@vendure/common": "3.5.3",
+        "@vendure/core": "3.5.3",
         "@vitest/browser": "^3.2.4",
         "@vitest/coverage-v8": "^3.2.4",
         "eslint": "^9.19.0",
@@ -52225,21 +52225,21 @@
       }
     },
     "packages/dev-server": {
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@nestjs/axios": "^4.0.0",
-        "@vendure/admin-ui-plugin": "3.5.2",
-        "@vendure/asset-server-plugin": "3.5.2",
-        "@vendure/common": "3.5.2",
-        "@vendure/core": "3.5.2",
-        "@vendure/elasticsearch-plugin": "3.5.2",
-        "@vendure/email-plugin": "3.5.2",
+        "@vendure/admin-ui-plugin": "3.5.3",
+        "@vendure/asset-server-plugin": "3.5.3",
+        "@vendure/common": "3.5.3",
+        "@vendure/core": "3.5.3",
+        "@vendure/elasticsearch-plugin": "3.5.3",
+        "@vendure/email-plugin": "3.5.3",
         "typescript": "5.8.2"
       },
       "devDependencies": {
-        "@vendure/testing": "3.5.2",
-        "@vendure/ui-devkit": "3.5.2",
+        "@vendure/testing": "3.5.3",
+        "@vendure/ui-devkit": "3.5.3",
         "commander": "^12.0.0",
         "concurrently": "^9.2.0",
         "csv-stringify": "^6.4.6",
@@ -52261,7 +52261,7 @@
     },
     "packages/elasticsearch-plugin": {
       "name": "@vendure/elasticsearch-plugin",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@elastic/elasticsearch": "9.1.0",
@@ -52269,8 +52269,8 @@
         "fast-deep-equal": "^3.1.3"
       },
       "devDependencies": {
-        "@vendure/common": "3.5.2",
-        "@vendure/core": "3.5.2",
+        "@vendure/common": "3.5.3",
+        "@vendure/core": "3.5.3",
         "rimraf": "^5.0.5",
         "typescript": "5.8.2"
       },
@@ -52280,7 +52280,7 @@
     },
     "packages/email-plugin": {
       "name": "@vendure/email-plugin",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@types/nodemailer": "^6.4.9",
@@ -52296,8 +52296,8 @@
         "@types/express": "^5.0.1",
         "@types/fs-extra": "^11.0.4",
         "@types/mjml": "^4.7.4",
-        "@vendure/common": "3.5.2",
-        "@vendure/core": "3.5.2",
+        "@vendure/common": "3.5.3",
+        "@vendure/core": "3.5.3",
         "rimraf": "^5.0.5",
         "typescript": "5.8.2"
       },
@@ -52307,7 +52307,7 @@
     },
     "packages/graphiql-plugin": {
       "name": "@vendure/graphiql-plugin",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "express": "^5.1.0"
@@ -52317,8 +52317,8 @@
         "@types/express": "^5.0.0",
         "@types/react": "^19.0.0",
         "@types/react-dom": "^19.0.0",
-        "@vendure/common": "3.5.2",
-        "@vendure/core": "3.5.2",
+        "@vendure/common": "3.5.3",
+        "@vendure/core": "3.5.3",
         "@vitejs/plugin-react": "^5.0.4",
         "graphiql": "^4.0.2",
         "react": "^19.0.0",
@@ -52426,14 +52426,14 @@
     },
     "packages/harden-plugin": {
       "name": "@vendure/harden-plugin",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "graphql-query-complexity": "^0.12.0"
       },
       "devDependencies": {
-        "@vendure/common": "3.5.2",
-        "@vendure/core": "3.5.2"
+        "@vendure/common": "3.5.3",
+        "@vendure/core": "3.5.3"
       },
       "funding": {
         "url": "https://github.com/sponsors/michaelbromley"
@@ -52444,12 +52444,12 @@
     },
     "packages/job-queue-plugin": {
       "name": "@vendure/job-queue-plugin",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "devDependencies": {
         "@google-cloud/pubsub": "^4.11.0",
-        "@vendure/common": "3.5.2",
-        "@vendure/core": "3.5.2",
+        "@vendure/common": "3.5.3",
+        "@vendure/core": "3.5.3",
         "bullmq": "^5.67.1",
         "ioredis": "5.9.2",
         "rimraf": "^5.0.5",
@@ -52477,7 +52477,7 @@
     },
     "packages/payments-plugin": {
       "name": "@vendure/payments-plugin",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "currency.js": "2.0.4"
@@ -52486,9 +52486,9 @@
         "@mollie/api-client": "^4.3.3",
         "@types/braintree": "^3.3.11",
         "@types/localtunnel": "2.0.4",
-        "@vendure/common": "3.5.2",
-        "@vendure/core": "3.5.2",
-        "@vendure/testing": "3.5.2",
+        "@vendure/common": "3.5.3",
+        "@vendure/core": "3.5.3",
+        "@vendure/testing": "3.5.3",
         "braintree": "^3.22.0",
         "localtunnel": "2.0.2",
         "nock": "^13.1.4",
@@ -52518,15 +52518,15 @@
     },
     "packages/sentry-plugin": {
       "name": "@vendure/sentry-plugin",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@sentry/nestjs": "^10.2.0",
         "@sentry/profiling-node": "^10.2.0"
       },
       "devDependencies": {
-        "@vendure/common": "3.5.2",
-        "@vendure/core": "3.5.2"
+        "@vendure/common": "3.5.3",
+        "@vendure/core": "3.5.3"
       },
       "funding": {
         "url": "https://github.com/sponsors/michaelbromley"
@@ -52534,14 +52534,14 @@
     },
     "packages/stellate-plugin": {
       "name": "@vendure/stellate-plugin",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "node-fetch": "^2.7.0"
       },
       "devDependencies": {
-        "@vendure/common": "3.5.2",
-        "@vendure/core": "3.5.2"
+        "@vendure/common": "3.5.3",
+        "@vendure/core": "3.5.3"
       },
       "funding": {
         "url": "https://github.com/sponsors/michaelbromley"
@@ -52549,7 +52549,7 @@
     },
     "packages/telemetry-plugin": {
       "name": "@vendure/telemetry-plugin",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@opentelemetry/api": "^1.9.0",
@@ -52563,8 +52563,8 @@
         "javascript-stringify": "^2.1.0"
       },
       "devDependencies": {
-        "@vendure/common": "3.5.2",
-        "@vendure/core": "3.5.2",
+        "@vendure/common": "3.5.3",
+        "@vendure/core": "3.5.3",
         "typescript": "5.8.2"
       },
       "funding": {
@@ -52573,11 +52573,11 @@
     },
     "packages/testing": {
       "name": "@vendure/testing",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@graphql-typed-document-node/core": "^3.2.0",
-        "@vendure/common": "3.5.2",
+        "@vendure/common": "3.5.3",
         "faker": "^4.1.0",
         "form-data": "^4.0.0",
         "graphql": "^16.11.0",
@@ -52590,7 +52590,7 @@
         "@types/mysql": "^2.15.26",
         "@types/node-fetch": "^2.6.4",
         "@types/pg": "^8.11.2",
-        "@vendure/core": "3.5.2",
+        "@vendure/core": "3.5.3",
         "mysql2": "^3.15.0",
         "pg": "^8.11.3",
         "rimraf": "^5.0.5",
@@ -52602,15 +52602,15 @@
     },
     "packages/ui-devkit": {
       "name": "@vendure/ui-devkit",
-      "version": "3.5.2",
+      "version": "3.5.3",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@angular-devkit/build-angular": "^19.2.5",
         "@angular/cli": "^19.2.5",
         "@angular/compiler": "^19.2.4",
         "@angular/compiler-cli": "^19.2.4",
-        "@vendure/admin-ui": "3.5.2",
-        "@vendure/common": "3.5.2",
+        "@vendure/admin-ui": "3.5.3",
+        "@vendure/common": "3.5.3",
         "chalk": "^4.1.0",
         "chokidar": "^3.6.0",
         "fs-extra": "^11.2.0",
@@ -52621,7 +52621,7 @@
         "@rollup/plugin-node-resolve": "^15.2.3",
         "@rollup/plugin-terser": "^0.4.4",
         "@types/fs-extra": "^11.0.4",
-        "@vendure/core": "3.5.2",
+        "@vendure/core": "3.5.3",
         "react": "^19.0.0",
         "react-dom": "^19.0.0",
         "rimraf": "^5.0.5",

packages/core/e2e/custom-fields.e2e-spec.ts

@@ -1084,7 +1084,7 @@ describe('Custom fields', () => {
     it('persists custom fields when creating a new ProductVariantPrice', async () => {
         // First, add EUR to the channel's available currencies
         await adminClient.query(
-            gql`
+            graphql(`
                 mutation UpdateChannel($input: UpdateChannelInput!) {
                     updateChannel(input: $input) {
                         ... on Channel {
@@ -1093,7 +1093,7 @@ describe('Custom fields', () => {
                         }
                     }
                 }
-            `,
+            `),
             {
                 input: {
                     id: 'T_1',
@@ -1104,7 +1104,7 @@ describe('Custom fields', () => {
 
         // Now create a new price in EUR with custom fields
         const { updateProductVariants } = await adminClient.query(
-            gql`
+            graphql(`
                 mutation UpdateProductVariants($input: [UpdateProductVariantInput!]!) {
                     updateProductVariants(input: $input) {
                         id
@@ -1117,7 +1117,7 @@ describe('Custom fields', () => {
                         }
                     }
                 }
-            `,
+            `),
             {
                 input: [
                     {