Merge branch 'master' into minor

.lintstagedrc.json

@@ -8,7 +8,7 @@
     "npm run format",
     "git add"
   ],
-  "packages/**/*.ts": [
+  "packages/!(dev-server)/**/*.ts": [
     "npm run lint",
     "npm run format",
     "git add"

CHANGELOG.md

@@ -1,3 +1,33 @@
+## <small>2.2.7 (2024-06-27)</small>
+
+
+#### Fixes
+
+* **admin-ui** Fix creation of variant with zero price ([317deef](https://github.com/vendure-ecommerce/vendure/commit/317deef)), closes [#2917](https://github.com/vendure-ecommerce/vendure/issues/2917)
+* **admin-ui** Fix defaultValue on React RichTextEditor ([051d56f](https://github.com/vendure-ecommerce/vendure/commit/051d56f)), closes [#2884](https://github.com/vendure-ecommerce/vendure/issues/2884)
+* **admin-ui** Fix error on new product creation ([b06bdaf](https://github.com/vendure-ecommerce/vendure/commit/b06bdaf)), closes [#2915](https://github.com/vendure-ecommerce/vendure/issues/2915)
+* **admin-ui** Fix styling of React RichTextEditor component ([353ae50](https://github.com/vendure-ecommerce/vendure/commit/353ae50)), closes [#2885](https://github.com/vendure-ecommerce/vendure/issues/2885)
+* **admin-ui** Fix support for canDeactivate guard on angular routes ([6d9af1d](https://github.com/vendure-ecommerce/vendure/commit/6d9af1d))
+* **core** Correctly apply global and per-route cookie middlewares (#2911) ([2d2e518](https://github.com/vendure-ecommerce/vendure/commit/2d2e518)), closes [#2911](https://github.com/vendure-ecommerce/vendure/issues/2911)
+* **payments-plugin** Prevent duplicate Mollie order lines (#2922) ([74a8c05](https://github.com/vendure-ecommerce/vendure/commit/74a8c05)), closes [#2922](https://github.com/vendure-ecommerce/vendure/issues/2922)
+
+## <small>2.2.6 (2024-06-18)</small>
+
+
+#### Fixes
+
+* **admin-ui** Fix id of customer groups list ([33780ce](https://github.com/vendure-ecommerce/vendure/commit/33780ce)), closes [#2894](https://github.com/vendure-ecommerce/vendure/issues/2894)
+* **admin-ui** Fix layout issues with asset picker dialog ([996710c](https://github.com/vendure-ecommerce/vendure/commit/996710c)), closes [#2898](https://github.com/vendure-ecommerce/vendure/issues/2898)
+* **admin-ui** Fix layout of custom timeline entries ([3e075aa](https://github.com/vendure-ecommerce/vendure/commit/3e075aa))
+* **admin-ui** Fix renaming of multiple product options at once ([3de60b2](https://github.com/vendure-ecommerce/vendure/commit/3de60b2)), closes [#2892](https://github.com/vendure-ecommerce/vendure/issues/2892)
+* **admin-ui** Generate variants even when values have not been changed ([b393538](https://github.com/vendure-ecommerce/vendure/commit/b393538)), closes [#2895](https://github.com/vendure-ecommerce/vendure/issues/2895)
+* **admin-ui** Show correct facet value language version on lang change ([7a62e7a](https://github.com/vendure-ecommerce/vendure/commit/7a62e7a)), closes [#2889](https://github.com/vendure-ecommerce/vendure/issues/2889)
+* **core** Copy prices in product duplicator (#2900) ([18d200c](https://github.com/vendure-ecommerce/vendure/commit/18d200c)), closes [#2900](https://github.com/vendure-ecommerce/vendure/issues/2900)
+* **core** Fix access to protected custom fields in Shop API ([090ff9b](https://github.com/vendure-ecommerce/vendure/commit/090ff9b)), closes [#2878](https://github.com/vendure-ecommerce/vendure/issues/2878)
+* **core** Fix memory leak cause by unbounded array growth ([5a38f42](https://github.com/vendure-ecommerce/vendure/commit/5a38f42))
+* **core** Fix regression in cookie middleware when no name provided ([fd729fd](https://github.com/vendure-ecommerce/vendure/commit/fd729fd)), closes [#2880](https://github.com/vendure-ecommerce/vendure/issues/2880)
+* **core** Support new object ref returned from plugin configuration fn ([45df738](https://github.com/vendure-ecommerce/vendure/commit/45df738)), closes [#2906](https://github.com/vendure-ecommerce/vendure/issues/2906)
+
 ## <small>2.2.5 (2024-06-03)</small>
 
 

README.md

@@ -11,7 +11,7 @@ An open-source headless commerce platform built on [Node.js](https://nodejs.org)
 
 ### [www.vendure.io](https://www.vendure.io/)
 
-* [Getting Started](https://docs.vendure.io/getting-started/): Get Vendure up and running locally in a matter of minutes with a single command
+* [Getting Started](https://docs.vendure.io/guides/getting-started/installation/): Get Vendure up and running locally in a matter of minutes with a single command
 * [Live Demo](https://demo.vendure.io/)
 * [Vendure Discord](https://www.vendure.io/community) Join us on Discord for support and answers to your questions
 

docs/docs/guides/developer-guide/custom-fields/index.md

@@ -7,7 +7,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CustomFieldProperty from '@site/src/components/CustomFieldProperty';
 
-Custom fields allow you to add your own custom data properties almost every Vendure entity. The entities which may have custom fields defined are listed in the [CustomFields interface documentation](/reference/typescript-api/custom-fields/).
+Custom fields allow you to add your own custom data properties to almost every Vendure entity. The entities which may have custom fields defined are listed in the [CustomFields interface documentation](/reference/typescript-api/custom-fields/).
 
 Some use-cases for custom fields include:
 
@@ -1202,7 +1202,7 @@ However, this sacrifices type safety. To make our custom fields type-safe we can
 ```ts
 // types.ts
 
-// Note: we are using deep a import here, rather than importing from `@vendure/core` due to
+// Note: we are using a deep import here, rather than importing from `@vendure/core` due to
 // a possible bug in TypeScript (https://github.com/microsoft/TypeScript/issues/46617) which
 // causes issues when multiple plugins extend the same custom fields interface.
 import { CustomProductFields } from '@vendure/core/dist/entity/custom-entity-fields';

docs/docs/guides/developer-guide/strategies-configurable-operations/index.mdx

@@ -48,7 +48,7 @@ export class MyOrderCodeStrategy implements OrderCodeStrategy {
 
 :::info
 
-All strategies can be make use of existing services by using the `init()` method. This is because all strategies
+All strategies can make use of existing services by using the `init()` method. This is because all strategies
 extend the underlying [`InjectableStrategy` interface](/reference/typescript-api/common/injectable-strategy). In
 this example we are assuming that we already created an `OrderCodeService` which contains all the specific logic for
 connecting to our backend service which generates the order codes.

docs/docs/guides/extending-the-admin-ui/getting-started/index.md

@@ -49,6 +49,30 @@ yarn add --dev @vendure/ui-devkit
 </TabItem>
 </Tabs>
 
+:::info
+If you plan to use React components in your UI extensions, you should also install the `@types/react` package:
+
+
+<Tabs>
+<TabItem value="npm" label="npm" default>
+
+```bash
+npm install --save-dev @types/react
+```
+
+</TabItem>
+<TabItem value="yarn" label="yarn">
+
+```bash
+yarn add --dev @types/react
+```
+
+</TabItem>
+</Tabs>
+
+:::
+
+
 You can then create the following folder structure to hold your UI extensions:
 
 ```

docs/docs/guides/extending-the-admin-ui/ui-library/index.md

@@ -180,6 +180,10 @@ Form inputs are styled globally, so you don't need to use special components for
     <vdr-form-field label="Invalid with error">
         <input type="text" [formControl]="invalidFormControl" />
     </vdr-form-field>
+    <vdr-rich-text-editor
+        class="form-grid-span"
+        label="Description"
+    ></vdr-rich-text-editor>
 </div>
 ```
 
@@ -189,7 +193,7 @@ Form inputs are styled globally, so you don't need to use special components for
 ```tsx
 import React from 'react';
 import { starIcon, userIcon } from '@cds/core/icon';
-import { FormField } from '@vendure/admin-ui/react';
+import { FormField, RichTextEditor } from '@vendure/admin-ui/react';
 
 export function DemoComponent() {
     return (
@@ -215,6 +219,7 @@ export function DemoComponent() {
             <FormField label="Invalid with error" invalid>
                 <input type="text" />
             </FormField>
+            <RichTextEditor className="form-grid-span" label="Description" readOnly={false} />
         </div>
     );
 }

lerna.json

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