Răsfoiți Sursa

Merge branch 'master' into minor

Michael Bromley 3 luni în urmă
părinte
comite
e908c47c40

+ 8 - 0
CHANGELOG.md

@@ -1,3 +1,11 @@
+## <small>3.4.4 (2025-10-08)</small>
+
+
+#### Fixes
+
+* **core** Omit saving Order.customFields on applyPriceAdjustments ([293a74b](https://github.com/vendure-ecommerce/vendure/commit/293a74b))
+* **create** Fix package resolution in monorepos ([7590b56](https://github.com/vendure-ecommerce/vendure/commit/7590b56))
+
 ## <small>3.4.3 (2025-10-02)</small>
 
 

+ 1 - 1
lerna.json

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

+ 16 - 0
license/signatures/version1/cla.json

@@ -775,6 +775,22 @@
       "created_at": "2025-10-03T07:58:58Z",
       "repoId": 136938012,
       "pullRequestNo": 3860
+    },
+    {
+      "name": "youssefabdennadher04",
+      "id": 210505907,
+      "comment_id": 3366228431,
+      "created_at": "2025-10-03T15:42:09Z",
+      "repoId": 136938012,
+      "pullRequestNo": 3861
+    },
+    {
+      "name": "brett-rand",
+      "id": 235410196,
+      "comment_id": 3373421038,
+      "created_at": "2025-10-06T19:00:41Z",
+      "repoId": 136938012,
+      "pullRequestNo": 3865
     }
   ]
 }

+ 4 - 4
packages/admin-ui-plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/admin-ui-plugin",
-    "version": "3.4.3",
+    "version": "3.4.4",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "files": [
@@ -25,9 +25,9 @@
     "devDependencies": {
         "@types/express": "^5.0.1",
         "@types/fs-extra": "^11.0.4",
-        "@vendure/admin-ui": "3.4.3",
-        "@vendure/common": "3.4.3",
-        "@vendure/core": "3.4.3",
+        "@vendure/admin-ui": "3.4.4",
+        "@vendure/common": "3.4.4",
+        "@vendure/core": "3.4.4",
         "express": "^5.1.0",
         "rimraf": "^5.0.5",
         "typescript": "5.8.2"

+ 2 - 2
packages/admin-ui/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/admin-ui",
-    "version": "3.4.3",
+    "version": "3.4.4",
     "license": "GPL-3.0-or-later",
     "repository": {
         "type": "git",
@@ -53,7 +53,7 @@
         "@ng-select/ng-select": "^14.2.6",
         "@ngx-translate/core": "^16.0.4",
         "@ngx-translate/http-loader": "^16.0.1",
-        "@vendure/common": "3.4.3",
+        "@vendure/common": "3.4.4",
         "@webcomponents/custom-elements": "^1.6.0",
         "apollo-angular": "^10.0.3",
         "apollo-upload-client": "^18.0.1",

+ 1 - 1
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.4.3';
+export const ADMIN_UI_VERSION = '3.4.4';

+ 3 - 3
packages/asset-server-plugin/package.json

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

+ 4 - 4
packages/cli/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/cli",
-    "version": "3.4.3",
+    "version": "3.4.4",
     "description": "A modern, headless ecommerce framework",
     "repository": {
         "type": "git",
@@ -37,7 +37,7 @@
     ],
     "dependencies": {
         "@clack/prompts": "^0.7.0",
-        "@vendure/common": "3.4.3",
+        "@vendure/common": "3.4.4",
         "change-case": "^4.1.2",
         "commander": "^11.0.0",
         "dotenv": "^16.4.5",
@@ -49,8 +49,8 @@
         "tsconfig-paths": "^4.2.0"
     },
     "devDependencies": {
-        "@vendure/core": "3.4.3",
-        "@vendure/testing": "3.4.3",
+        "@vendure/core": "3.4.4",
+        "@vendure/testing": "3.4.4",
         "cross-env": "^7.0.3",
         "typescript": "5.8.2"
     }

+ 1 - 1
packages/common/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/common",
-    "version": "3.4.3",
+    "version": "3.4.4",
     "main": "index.js",
     "license": "GPL-3.0-or-later",
     "repository": {

+ 2 - 2
packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/core",
-    "version": "3.4.3",
+    "version": "3.4.4",
     "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.4.3",
+        "@vendure/common": "3.4.4",
         "bcrypt": "^5.1.1",
         "body-parser": "^1.20.2",
         "cookie-session": "^2.1.0",

+ 1 - 0
packages/core/src/service/services/order.service.ts

@@ -2124,6 +2124,7 @@ export class OrderService {
                     'sellerOrders',
                     'customer',
                     'modifications',
+                    'customFields',
                 ]),
                 {
                     reload: false,

+ 3 - 3
packages/create/package.json

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

+ 3 - 3
packages/dashboard/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vendure/dashboard",
   "private": false,
-  "version": "3.4.3",
+  "version": "3.4.4",
   "type": "module",
   "repository": {
     "type": "git",
@@ -147,8 +147,8 @@
   "devDependencies": {
     "@eslint/js": "^9.19.0",
     "@types/node": "^22.13.4",
-    "@vendure/common": "3.4.3",
-    "@vendure/core": "3.4.3",
+    "@vendure/common": "3.4.4",
+    "@vendure/core": "3.4.4",
     "eslint": "^9.19.0",
     "eslint-plugin-react": "^7.37.4",
     "eslint-plugin-react-hooks": "^5.0.0",

+ 9 - 9
packages/dev-server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dev-server",
-    "version": "3.4.3",
+    "version": "3.4.4",
     "main": "index.js",
     "license": "GPL-3.0-or-later",
     "private": true,
@@ -20,17 +20,17 @@
     },
     "dependencies": {
         "@nestjs/axios": "^4.0.0",
-        "@vendure/admin-ui-plugin": "3.4.3",
-        "@vendure/asset-server-plugin": "3.4.3",
-        "@vendure/common": "3.4.3",
-        "@vendure/core": "3.4.3",
-        "@vendure/elasticsearch-plugin": "3.4.3",
-        "@vendure/email-plugin": "3.4.3",
+        "@vendure/admin-ui-plugin": "3.4.4",
+        "@vendure/asset-server-plugin": "3.4.4",
+        "@vendure/common": "3.4.4",
+        "@vendure/core": "3.4.4",
+        "@vendure/elasticsearch-plugin": "3.4.4",
+        "@vendure/email-plugin": "3.4.4",
         "typescript": "5.8.2"
     },
     "devDependencies": {
-        "@vendure/testing": "3.4.3",
-        "@vendure/ui-devkit": "3.4.3",
+        "@vendure/testing": "3.4.4",
+        "@vendure/ui-devkit": "3.4.4",
         "commander": "^12.0.0",
         "concurrently": "^9.2.0",
         "csv-stringify": "^6.4.6",

+ 3 - 3
packages/elasticsearch-plugin/package.json

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

+ 3 - 3
packages/email-plugin/package.json

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

+ 3 - 3
packages/graphiql-plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/graphiql-plugin",
-    "version": "3.4.3",
+    "version": "3.4.4",
     "license": "GPL-3.0-or-later",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -33,8 +33,8 @@
         "@types/express": "^5.0.0",
         "@types/react": "^19.0.0",
         "@types/react-dom": "^19.0.0",
-        "@vendure/common": "3.4.3",
-        "@vendure/core": "3.4.3",
+        "@vendure/common": "3.4.4",
+        "@vendure/core": "3.4.4",
         "@vitejs/plugin-react": "^5.0.4",
         "graphiql": "^4.0.2",
         "react": "^19.0.0",

+ 3 - 3
packages/harden-plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/harden-plugin",
-    "version": "3.4.3",
+    "version": "3.4.4",
     "license": "GPL-3.0-or-later",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -28,7 +28,7 @@
       "@apollo/server": "^4.12.2"
     },
     "devDependencies": {
-        "@vendure/common": "3.4.3",
-        "@vendure/core": "3.4.3"
+        "@vendure/common": "3.4.4",
+        "@vendure/core": "3.4.4"
     }
 }

+ 3 - 3
packages/job-queue-plugin/package.json

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

+ 4 - 4
packages/payments-plugin/package.json

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

+ 3 - 3
packages/sentry-plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/sentry-plugin",
-    "version": "3.4.3",
+    "version": "3.4.4",
     "license": "GPL-3.0-or-later",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -32,8 +32,8 @@
         "access": "public"
     },
     "devDependencies": {
-        "@vendure/common": "3.4.3",
-        "@vendure/core": "3.4.3"
+        "@vendure/common": "3.4.4",
+        "@vendure/core": "3.4.4"
     },
     "dependencies": {
         "@sentry/nestjs": "^10.2.0",

+ 3 - 3
packages/stellate-plugin/package.json

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

+ 3 - 3
packages/telemetry-plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/telemetry-plugin",
-    "version": "3.4.3",
+    "version": "3.4.4",
     "description": "Telemetry for Vendure",
     "repository": {
         "type": "git",
@@ -45,8 +45,8 @@
         "javascript-stringify": "^2.1.0"
     },
     "devDependencies": {
-        "@vendure/common": "3.4.3",
-        "@vendure/core": "3.4.3",
+        "@vendure/common": "3.4.4",
+        "@vendure/core": "3.4.4",
         "typescript": "5.8.2"
     }
 }

+ 3 - 3
packages/testing/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/testing",
-    "version": "3.4.3",
+    "version": "3.4.4",
     "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.4.3",
+        "@vendure/common": "3.4.4",
         "faker": "^4.1.0",
         "form-data": "^4.0.0",
         "graphql": "^16.11.0",
@@ -51,7 +51,7 @@
         "@types/mysql": "^2.15.26",
         "@types/node-fetch": "^2.6.4",
         "@types/pg": "^8.11.2",
-        "@vendure/core": "3.4.3",
+        "@vendure/core": "3.4.4",
         "mysql2": "^3.15.0",
         "pg": "^8.11.3",
         "rimraf": "^5.0.5",

+ 4 - 4
packages/ui-devkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/ui-devkit",
-    "version": "3.4.3",
+    "version": "3.4.4",
     "description": "A library for authoring Vendure Admin UI extensions",
     "keywords": [
         "vendure",
@@ -40,8 +40,8 @@
         "@angular/cli": "^19.2.5",
         "@angular/compiler": "^19.2.4",
         "@angular/compiler-cli": "^19.2.4",
-        "@vendure/admin-ui": "3.4.3",
-        "@vendure/common": "3.4.3",
+        "@vendure/admin-ui": "3.4.4",
+        "@vendure/common": "3.4.4",
         "chalk": "^4.1.0",
         "chokidar": "^3.6.0",
         "fs-extra": "^11.2.0",
@@ -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.4.3",
+        "@vendure/core": "3.4.4",
         "react": "^19.0.0",
         "react-dom": "^19.0.0",
         "rimraf": "^5.0.5",