Merge branch 'master' into minor

packages/core/e2e/custom-field-relations.e2e-spec.ts

@@ -1255,7 +1255,10 @@ describe('Custom field relations', () => {
             customEntity = await assertFound(
                 customEntityRepository.findOne({
                     where: { id: customEntityId },
-                    relations: ['customEntityListInverse', 'customEntityInverse'],
+                    relations: {
+                        customEntityInverse: true,
+                        customEntityListInverse: true,
+                    },
                 }),
             );
         });

packages/core/e2e/fixtures/test-plugins/with-custom-entity.ts

@@ -2,18 +2,25 @@ import { Collection, PluginCommonModule, VendureEntity, VendurePlugin } from '@v
 import gql from 'graphql-tag';
 import { DeepPartial, Entity, ManyToMany, OneToMany } from 'typeorm';
 
+declare module '@vendure/core/dist/entity/custom-entity-fields' {
+    interface CustomCollectionFields {
+        customEntity: TestCustomEntity;
+        customEntityList: TestCustomEntity[];
+    }
+}
+
 @Entity()
 export class TestCustomEntity extends VendureEntity {
     constructor(input?: DeepPartial<TestCustomEntity>) {
         super(input);
     }
 
-    @ManyToMany(() => Collection, x => (x as any).customFields?.customEntityList, {
+    @ManyToMany(() => Collection, c => c.customFields?.customEntityList, {
         eager: true,
     })
     customEntityListInverse: Collection[];
 
-    @OneToMany(() => Collection, (a: Collection) => (a.customFields as any).customEntity)
+    @OneToMany(() => Collection, c => c.customFields.customEntity)
     customEntityInverse: Collection[];
 }
 

packages/core/src/config/custom-field/custom-field-types.ts

@@ -100,7 +100,7 @@ export type RelationCustomFieldConfig = TypedCustomFieldConfig<
     entity: Type<VendureEntity>;
     graphQLType?: string;
     eager?: boolean;
-    inverseSide?: string | ((object: VendureEntity) => any);
+    inverseSide?: string | ((object: any) => any);
 };
 
 /**