Parcourir la source

chore: Update graphql to latest & root deps

Michael Bromley il y a 4 ans
Parent
commit
e03fdcd26b

+ 1 - 1
e2e-common/jest-config.js

@@ -14,7 +14,7 @@ module.exports = {
     reporters: ['default', path.join(__dirname, 'custom-reporter.js')],
     globals: {
         'ts-jest': {
-            tsConfig: '<rootDir>/config/tsconfig.e2e.json',
+            tsconfig: '<rootDir>/config/tsconfig.e2e.json',
             diagnostics: false,
             isolatedModules: true,
         },

+ 21 - 21
package.json

@@ -28,33 +28,33 @@
     "publish-local": "lerna version --no-git-tag-version && cd scripts && ./publish-to-verdaccio.sh"
   },
   "devDependencies": {
-    "@commitlint/cli": "^11.0.0",
-    "@commitlint/config-conventional": "^11.0.0",
-    "@graphql-codegen/add": "2.0.1",
-    "@graphql-codegen/cli": "1.17.8",
-    "@graphql-codegen/fragment-matcher": "1.17.8",
-    "@graphql-codegen/typescript": "1.17.9",
-    "@graphql-codegen/typescript-compatibility": "2.0.0",
-    "@graphql-codegen/typescript-operations": "1.17.7",
+    "@commitlint/cli": "^12.0.1",
+    "@commitlint/config-conventional": "^12.0.1",
+    "@graphql-codegen/add": "2.0.2",
+    "@graphql-codegen/cli": "1.21.1",
+    "@graphql-codegen/fragment-matcher": "2.0.1",
+    "@graphql-codegen/typescript": "1.21.0",
+    "@graphql-codegen/typescript-compatibility": "2.0.1",
+    "@graphql-codegen/typescript-operations": "1.17.14",
     "@graphql-tools/schema": "^6.2.4",
-    "@types/graphql": "^14.0.5",
-    "@types/jest": "^26.0.14",
+    "@types/graphql": "^14.5.0",
+    "@types/jest": "^26.0.20",
     "@types/klaw-sync": "^6.0.0",
-    "@types/node": "^12.12.0",
-    "concurrently": "^5.3.0",
-    "conventional-changelog-core": "^4.2.0",
+    "@types/node": "^14.14.31",
+    "concurrently": "^6.0.0",
+    "conventional-changelog-core": "^4.2.2",
     "find": "^0.3.0",
-    "graphql": "15.3.0",
+    "graphql": "15.5.0",
     "husky": "^4.3.0",
-    "jest": "^26.5.2",
+    "jest": "^26.6.3",
     "klaw-sync": "^6.0.0",
-    "lerna": "^3.22.1",
-    "lint-staged": "^10.4.0",
-    "prettier": "^2.1.2",
-    "ts-jest": "^26.4.1",
-    "ts-node": "^9.0.0",
+    "lerna": "^4.0.0",
+    "lint-staged": "^10.5.4",
+    "prettier": "^2.2.1",
+    "ts-jest": "^26.5.3",
+    "ts-node": "^9.1.1",
     "tslint": "^6.1.3",
-    "typescript": "4.0.3"
+    "typescript": "4.2.2"
   },
   "resolutions": {
     "npm-packlist": "1.1.12"

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

@@ -90,6 +90,6 @@
     "puppeteer": "^2.1.1",
     "rimraf": "^3.0.0",
     "tslint": "~6.1.0",
-    "typescript": "4.2.2"
+    "typescript": "4.1.5"
   }
 }

+ 20 - 18
packages/admin-ui/src/lib/core/src/common/generated-types.ts

@@ -1,6 +1,8 @@
 // tslint:disable
 export type Maybe<T> = T | null;
 export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
   ID: string;
@@ -1512,7 +1514,7 @@ export type ImportInfo = {
 /**
  * @description
  * The state of a Job in the JobQueue
- * 
+ *
  * @docsCategory common
  */
 export enum JobState {
@@ -2625,7 +2627,7 @@ export enum DeletionResult {
  * @description
  * Permissions for administrators and customers. Used to control access to
  * GraphQL resolvers via the {@link Allow} decorator.
- * 
+ *
  * @docsCategory common
  */
 export enum Permission {
@@ -3022,7 +3024,7 @@ export type CountryList = PaginatedList & {
 /**
  * @description
  * ISO 4217 currency code
- * 
+ *
  * @docsCategory common
  */
 export enum CurrencyCode {
@@ -3559,7 +3561,7 @@ export type HistoryEntryList = PaginatedList & {
  * region or script modifier (e.g. de_AT). The selection available is based
  * on the [Unicode CLDR summary list](https://unicode-org.github.io/cldr-staging/charts/37/summary/root.html)
  * and includes the major spoken languages of the world and any widely-used variants.
- * 
+ *
  * @docsCategory common
  */
 export enum LanguageCode {
@@ -3938,7 +3940,7 @@ export type OrderItem = Node & {
   unitPriceWithTax: Scalars['Int'];
   /**
    * The price of a single unit including discounts, excluding tax.
-   * 
+   *
    * If Order-level discounts have been applied, this will not be the
    * actual taxable unit price (see `proratedUnitPrice`), but is generally the
    * correct price to display to customers to avoid confusion
@@ -3982,7 +3984,7 @@ export type OrderLine = Node & {
   unitPriceWithTaxChangeSinceAdded: Scalars['Int'];
   /**
    * The price of a single unit including discounts, excluding tax.
-   * 
+   *
    * If Order-level discounts have been applied, this will not be the
    * actual taxable unit price (see `proratedUnitPrice`), but is generally the
    * correct price to display to customers to avoid confusion
@@ -5160,7 +5162,7 @@ export type SetActiveChannelMutation = { setActiveChannel: (
   ) };
 
 export type UpdateUserChannelsMutationVariables = Exact<{
-  channels: Array<CurrentUserChannelInput>;
+  channels: Array<CurrentUserChannelInput> | CurrentUserChannelInput;
 }>;
 
 
@@ -5475,7 +5477,7 @@ export type GetCustomerGroupWithCustomersQuery = { customerGroup?: Maybe<(
 
 export type AddCustomersToGroupMutationVariables = Exact<{
   groupId: Scalars['ID'];
-  customerIds: Array<Scalars['ID']>;
+  customerIds: Array<Scalars['ID']> | Scalars['ID'];
 }>;
 
 
@@ -5486,7 +5488,7 @@ export type AddCustomersToGroupMutation = { addCustomersToGroup: (
 
 export type RemoveCustomersFromGroupMutationVariables = Exact<{
   groupId: Scalars['ID'];
-  customerIds: Array<Scalars['ID']>;
+  customerIds: Array<Scalars['ID']> | Scalars['ID'];
 }>;
 
 
@@ -5604,7 +5606,7 @@ export type DeleteFacetMutation = { deleteFacet: (
   ) };
 
 export type CreateFacetValuesMutationVariables = Exact<{
-  input: Array<CreateFacetValueInput>;
+  input: Array<CreateFacetValueInput> | CreateFacetValueInput;
 }>;
 
 
@@ -5614,7 +5616,7 @@ export type CreateFacetValuesMutation = { createFacetValues: Array<(
   )> };
 
 export type UpdateFacetValuesMutationVariables = Exact<{
-  input: Array<UpdateFacetValueInput>;
+  input: Array<UpdateFacetValueInput> | UpdateFacetValueInput;
 }>;
 
 
@@ -5624,7 +5626,7 @@ export type UpdateFacetValuesMutation = { updateFacetValues: Array<(
   )> };
 
 export type DeleteFacetValuesMutationVariables = Exact<{
-  ids: Array<Scalars['ID']>;
+  ids: Array<Scalars['ID']> | Scalars['ID'];
   force?: Maybe<Scalars['Boolean']>;
 }>;
 
@@ -6242,7 +6244,7 @@ export type DeleteProductMutation = { deleteProduct: (
   ) };
 
 export type CreateProductVariantsMutationVariables = Exact<{
-  input: Array<CreateProductVariantInput>;
+  input: Array<CreateProductVariantInput> | CreateProductVariantInput;
 }>;
 
 
@@ -6252,7 +6254,7 @@ export type CreateProductVariantsMutation = { createProductVariants: Array<Maybe
   )>> };
 
 export type UpdateProductVariantsMutationVariables = Exact<{
-  input: Array<UpdateProductVariantInput>;
+  input: Array<UpdateProductVariantInput> | UpdateProductVariantInput;
 }>;
 
 
@@ -6421,7 +6423,7 @@ export type GetAssetQuery = { asset?: Maybe<(
   )> };
 
 export type CreateAssetsMutationVariables = Exact<{
-  input: Array<CreateAssetInput>;
+  input: Array<CreateAssetInput> | CreateAssetInput;
 }>;
 
 
@@ -6963,7 +6965,7 @@ export type DeleteZoneMutation = { deleteZone: (
 
 export type AddMembersToZoneMutationVariables = Exact<{
   zoneId: Scalars['ID'];
-  memberIds: Array<Scalars['ID']>;
+  memberIds: Array<Scalars['ID']> | Scalars['ID'];
 }>;
 
 
@@ -6974,7 +6976,7 @@ export type AddMembersToZoneMutation = { addMembersToZone: (
 
 export type RemoveMembersFromZoneMutationVariables = Exact<{
   zoneId: Scalars['ID'];
-  memberIds: Array<Scalars['ID']>;
+  memberIds: Array<Scalars['ID']> | Scalars['ID'];
 }>;
 
 
@@ -7884,7 +7886,7 @@ export type GetAllJobsQuery = { jobs: (
   ) };
 
 export type GetJobsByIdQueryVariables = Exact<{
-  ids: Array<Scalars['ID']>;
+  ids: Array<Scalars['ID']> | Scalars['ID'];
 }>;
 
 

+ 1 - 1
packages/admin-ui/src/lib/core/src/data/client-state/client-resolvers.ts

@@ -119,7 +119,7 @@ export const clientResolvers: ResolverDefinition = {
             const data = {
                 userStatus: {
                     ...previous.userStatus,
-                    channels: args.channels,
+                    channels: Array.isArray(args.channels) ? args.channels : [args.channels],
                 },
             };
             cache.writeQuery({ query: GET_USER_STATUS, data });

+ 3 - 1
packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts

@@ -1,6 +1,8 @@
 // tslint:disable
 export type Maybe<T> = T | null;
 export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
     ID: string;
@@ -4535,7 +4537,7 @@ export type CustomFields = {
 };
 
 export type CreateAssetsMutationVariables = Exact<{
-    input: Array<CreateAssetInput>;
+    input: Array<CreateAssetInput> | CreateAssetInput;
 }>;
 
 export type CreateAssetsMutation = {

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

@@ -24,7 +24,7 @@
     "@types/sharp": "^0.26.0",
     "@vendure/common": "^0.18.4",
     "@vendure/core": "^0.18.5",
-    "aws-sdk": "^2.766.0",
+    "aws-sdk": "^2.856.0",
     "express": "^4.17.1",
     "node-fetch": "^2.6.1",
     "rimraf": "^3.0.2",

+ 23 - 1
packages/asset-server-plugin/src/s3-asset-storage-strategy.ts

@@ -183,7 +183,29 @@ export class S3AssetStorageStrategy implements AssetStorageStrategy {
 
     async readFileToBuffer(identifier: string): Promise<Buffer> {
         const result = await this.s3.getObject(this.getObjectParams(identifier)).promise();
-        return Buffer.from(result.Body as Stream);
+        const body = result.Body;
+        if (!body) {
+            Logger.error(`Got undefined Body for ${identifier}`, loggerCtx);
+            return Buffer.from('');
+        }
+        if (body instanceof Buffer) {
+            return body;
+        }
+        if (body instanceof Uint8Array || typeof body === 'string') {
+            return Buffer.from(body);
+        }
+        if (body instanceof Readable) {
+            return new Promise((resolve, reject) => {
+                const buf: any[] = [];
+                body.on('data', data => buf.push(data));
+                body.on('error', err => reject(err));
+                body.on('end', () => {
+                    const intArray = Uint8Array.from(buf);
+                    resolve(Buffer.concat([intArray]));
+                });
+            });
+        }
+        return Buffer.from(body as any);
     }
 
     async readFileToStream(identifier: string): Promise<Stream> {

+ 2 - 0
packages/common/src/generated-shop-types.ts

@@ -1,6 +1,8 @@
 // tslint:disable
 export type Maybe<T> = T;
 export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
     ID: string | number;

+ 8 - 6
packages/common/src/generated-types.ts

@@ -1,6 +1,8 @@
 // tslint:disable
 export type Maybe<T> = T;
 export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
   ID: string | number;
@@ -1475,7 +1477,7 @@ export type ImportInfo = {
 /**
  * @description
  * The state of a Job in the JobQueue
- * 
+ *
  * @docsCategory common
  */
 export enum JobState {
@@ -2588,7 +2590,7 @@ export enum DeletionResult {
  * @description
  * Permissions for administrators and customers. Used to control access to
  * GraphQL resolvers via the {@link Allow} decorator.
- * 
+ *
  * @docsCategory common
  */
 export enum Permission {
@@ -2984,7 +2986,7 @@ export type CountryList = PaginatedList & {
 /**
  * @description
  * ISO 4217 currency code
- * 
+ *
  * @docsCategory common
  */
 export enum CurrencyCode {
@@ -3521,7 +3523,7 @@ export type HistoryEntryList = PaginatedList & {
  * region or script modifier (e.g. de_AT). The selection available is based
  * on the [Unicode CLDR summary list](https://unicode-org.github.io/cldr-staging/charts/37/summary/root.html)
  * and includes the major spoken languages of the world and any widely-used variants.
- * 
+ *
  * @docsCategory common
  */
 export enum LanguageCode {
@@ -3900,7 +3902,7 @@ export type OrderItem = Node & {
   unitPriceWithTax: Scalars['Int'];
   /**
    * The price of a single unit including discounts, excluding tax.
-   * 
+   *
    * If Order-level discounts have been applied, this will not be the
    * actual taxable unit price (see `proratedUnitPrice`), but is generally the
    * correct price to display to customers to avoid confusion
@@ -3944,7 +3946,7 @@ export type OrderLine = Node & {
   unitPriceWithTaxChangeSinceAdded: Scalars['Int'];
   /**
    * The price of a single unit including discounts, excluding tax.
-   * 
+   *
    * If Order-level discounts have been applied, this will not be the
    * actual taxable unit price (see `proratedUnitPrice`), but is generally the
    * correct price to display to customers to avoid confusion

+ 13 - 11
packages/core/e2e/graphql/generated-e2e-admin-types.ts

@@ -1,6 +1,8 @@
 // tslint:disable
 export type Maybe<T> = T | null;
 export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
     ID: string;
@@ -4986,7 +4988,7 @@ export type GetFacetWithValuesQueryVariables = Exact<{
 export type GetFacetWithValuesQuery = { facet?: Maybe<FacetWithValuesFragment> };
 
 export type DeleteFacetValuesMutationVariables = Exact<{
-    ids: Array<Scalars['ID']>;
+    ids: Array<Scalars['ID']> | Scalars['ID'];
     force?: Maybe<Scalars['Boolean']>;
 }>;
 
@@ -5010,13 +5012,13 @@ export type GetProductListWithVariantsQuery = {
 };
 
 export type CreateFacetValuesMutationVariables = Exact<{
-    input: Array<CreateFacetValueInput>;
+    input: Array<CreateFacetValueInput> | CreateFacetValueInput;
 }>;
 
 export type CreateFacetValuesMutation = { createFacetValues: Array<FacetValueFragment> };
 
 export type UpdateFacetValuesMutationVariables = Exact<{
-    input: Array<UpdateFacetValueInput>;
+    input: Array<UpdateFacetValueInput> | UpdateFacetValueInput;
 }>;
 
 export type UpdateFacetValuesMutation = { updateFacetValues: Array<FacetValueFragment> };
@@ -5324,13 +5326,13 @@ export type GetProductListQuery = {
 };
 
 export type CreateProductVariantsMutationVariables = Exact<{
-    input: Array<CreateProductVariantInput>;
+    input: Array<CreateProductVariantInput> | CreateProductVariantInput;
 }>;
 
 export type CreateProductVariantsMutation = { createProductVariants: Array<Maybe<ProductVariantFragment>> };
 
 export type UpdateProductVariantsMutationVariables = Exact<{
-    input: Array<UpdateProductVariantInput>;
+    input: Array<UpdateProductVariantInput> | UpdateProductVariantInput;
 }>;
 
 export type UpdateProductVariantsMutation = { updateProductVariants: Array<Maybe<ProductVariantFragment>> };
@@ -5589,7 +5591,7 @@ export type CreateCustomerGroupMutation = { createCustomerGroup: CustomerGroupFr
 
 export type RemoveCustomersFromGroupMutationVariables = Exact<{
     groupId: Scalars['ID'];
-    customerIds: Array<Scalars['ID']>;
+    customerIds: Array<Scalars['ID']> | Scalars['ID'];
 }>;
 
 export type RemoveCustomersFromGroupMutation = { removeCustomersFromGroup: CustomerGroupFragment };
@@ -5749,7 +5751,7 @@ export type GetCustomerGroupQuery = {
 
 export type AddCustomersToGroupMutationVariables = Exact<{
     groupId: Scalars['ID'];
-    customerIds: Array<Scalars['ID']>;
+    customerIds: Array<Scalars['ID']> | Scalars['ID'];
 }>;
 
 export type AddCustomersToGroupMutation = { addCustomersToGroup: CustomerGroupFragment };
@@ -5896,7 +5898,7 @@ export type GetAssetFragmentFirstQueryVariables = Exact<{
 export type GetAssetFragmentFirstQuery = { asset?: Maybe<AssetFragFirstFragment> };
 
 export type CreateAssetsMutationVariables = Exact<{
-    input: Array<CreateAssetInput>;
+    input: Array<CreateAssetInput> | CreateAssetInput;
 }>;
 
 export type CreateAssetsMutation = {
@@ -6408,7 +6410,7 @@ export type GetCustomerIdsQueryVariables = Exact<{ [key: string]: never }>;
 export type GetCustomerIdsQuery = { customers: { items: Array<Pick<Customer, 'id'>> } };
 
 export type UpdateStockMutationVariables = Exact<{
-    input: Array<UpdateProductVariantInput>;
+    input: Array<UpdateProductVariantInput> | UpdateProductVariantInput;
 }>;
 
 export type UpdateStockMutation = { updateProductVariants: Array<Maybe<VariantWithStockFragment>> };
@@ -6529,14 +6531,14 @@ export type UpdateZoneMutation = { updateZone: ZoneFragment };
 
 export type AddMembersToZoneMutationVariables = Exact<{
     zoneId: Scalars['ID'];
-    memberIds: Array<Scalars['ID']>;
+    memberIds: Array<Scalars['ID']> | Scalars['ID'];
 }>;
 
 export type AddMembersToZoneMutation = { addMembersToZone: ZoneFragment };
 
 export type RemoveMembersFromZoneMutationVariables = Exact<{
     zoneId: Scalars['ID'];
-    memberIds: Array<Scalars['ID']>;
+    memberIds: Array<Scalars['ID']> | Scalars['ID'];
 }>;
 
 export type RemoveMembersFromZoneMutation = { removeMembersFromZone: ZoneFragment };

+ 2 - 0
packages/core/e2e/graphql/generated-e2e-shop-types.ts

@@ -1,6 +1,8 @@
 // tslint:disable
 export type Maybe<T> = T | null;
 export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
     ID: string;

+ 3 - 10
packages/core/jest.config.js

@@ -1,22 +1,15 @@
 module.exports = {
     coverageDirectory: 'coverage',
-    moduleFileExtensions: [
-        'js',
-        'json',
-        'ts',
-    ],
+    moduleFileExtensions: ['js', 'json', 'ts'],
     preset: 'ts-jest',
     rootDir: __dirname,
-    roots: [
-        '<rootDir>/src',
-        '<rootDir>/mock-data',
-    ],
+    roots: ['<rootDir>/src', '<rootDir>/mock-data'],
     transform: {
         '^.+\\.(t|j)s$': 'ts-jest',
     },
     globals: {
         'ts-jest': {
-            tsConfig: {
+            tsconfig: {
                 allowJs: true,
             },
         },

+ 2 - 2
packages/core/package.json

@@ -57,7 +57,7 @@
     "csv-parse": "^4.12.0",
     "express": "^4.17.1",
     "fs-extra": "^9.0.1",
-    "graphql": "15.3.0",
+    "graphql": "15.5.0",
     "graphql-iso-date": "^3.6.1",
     "graphql-tag": "^2.11.0",
     "graphql-type-json": "^0.3.2",
@@ -88,7 +88,7 @@
     "@types/mime-types": "^2.1.0",
     "@types/ms": "^0.7.31",
     "@types/nanoid": "^2.1.0",
-    "@types/node": "^10.12.18",
+    "@types/node": "^14.14.31",
     "@types/progress": "^2.0.3",
     "@types/prompts": "^2.0.9",
     "better-sqlite3": "^7.1.1",

+ 1 - 0
packages/core/src/api/config/generate-list-options.ts

@@ -62,6 +62,7 @@ export function generateListOptions(typeDefsOrSchema: string | GraphQLSchema): G
                     defaultValue: null,
                     extensions: null,
                     astNode: null,
+                    deprecationReason: null,
                 });
             }
 

+ 2 - 0
packages/core/src/api/config/graphql-custom-fields.ts

@@ -342,6 +342,7 @@ export function addOrderLineCustomFieldsInput(
             defaultValue: null,
             extensions: null,
             astNode: null,
+            deprecationReason: null,
         });
     }
     if (adjustOrderLineMutation) {
@@ -352,6 +353,7 @@ export function addOrderLineCustomFieldsInput(
             defaultValue: null,
             extensions: null,
             astNode: null,
+            deprecationReason: null,
         });
     }
 

+ 2 - 0
packages/elasticsearch-plugin/e2e/graphql/generated-e2e-elasticsearch-plugin-types.ts

@@ -1,6 +1,8 @@
 // tslint:disable
 export type Maybe<T> = T | null;
 export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
     ID: string;

+ 3 - 9
packages/elasticsearch-plugin/jest.config.js

@@ -1,21 +1,15 @@
 module.exports = {
     coverageDirectory: 'coverage',
-    moduleFileExtensions: [
-        'js',
-        'json',
-        'ts',
-    ],
+    moduleFileExtensions: ['js', 'json', 'ts'],
     preset: 'ts-jest',
     rootDir: __dirname,
-    roots: [
-        '<rootDir>/src',
-    ],
+    roots: ['<rootDir>/src'],
     transform: {
         '^.+\\.(t|j)s$': 'ts-jest',
     },
     globals: {
         'ts-jest': {
-            tsConfig: {
+            tsconfig: {
                 allowJs: true,
                 skipLibCheck: true,
             },

+ 3 - 9
packages/email-plugin/jest.config.js

@@ -1,22 +1,16 @@
 module.exports = {
     coverageDirectory: 'coverage',
-    moduleFileExtensions: [
-        'js',
-        'json',
-        'ts',
-    ],
+    moduleFileExtensions: ['js', 'json', 'ts'],
     preset: 'ts-jest',
     rootDir: __dirname,
-    roots: [
-        '<rootDir>/src',
-    ],
+    roots: ['<rootDir>/src'],
     transform: {
         '^.+\\.(t|j)s$': 'ts-jest',
     },
     globals: {
         'ts-jest': {
             isolatedModules: true,
-            tsConfig: {
+            tsconfig: {
                 allowJs: true,
                 skipLibCheck: true,
             },

+ 3 - 9
packages/job-queue-plugin/jest.config.js

@@ -1,21 +1,15 @@
 module.exports = {
     coverageDirectory: 'coverage',
-    moduleFileExtensions: [
-        'js',
-        'json',
-        'ts',
-    ],
+    moduleFileExtensions: ['js', 'json', 'ts'],
     preset: 'ts-jest',
     rootDir: __dirname,
-    roots: [
-        '<rootDir>/src',
-    ],
+    roots: ['<rootDir>/src'],
     transform: {
         '^.+\\.(t|j)s$': 'ts-jest',
     },
     globals: {
         'ts-jest': {
-            tsConfig: {
+            tsconfig: {
                 allowJs: true,
                 skipLibCheck: true,
             },

+ 1 - 1
packages/testing/package.json

@@ -36,7 +36,7 @@
     "@vendure/common": "^0.18.4",
     "faker": "^4.1.0",
     "form-data": "^3.0.0",
-    "graphql": "15.3.0",
+    "graphql": "15.5.0",
     "graphql-tag": "^2.10.1",
     "node-fetch": "^2.6.0",
     "sql.js": "1.3.2"

Fichier diff supprimé car celui-ci est trop grand
+ 706 - 854
yarn.lock


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff