Vendure 2.1.1 Migration

package.json

@@ -36,12 +36,12 @@
     "@types/sharp": "0.28.0",
     "@types/tmp": "0.2.3",
     "@typescript-eslint/eslint-plugin": "5.43.0",
-    "@vendure/admin-ui-plugin": "2.0.9",
-    "@vendure/asset-server-plugin": "2.0.9",
-    "@vendure/core": "2.0.9",
-    "@vendure/email-plugin": "2.0.9",
-    "@vendure/testing": "2.0.9",
-    "@vendure/ui-devkit": "2.0.9",
+    "@vendure/admin-ui-plugin": "2.1.1",
+    "@vendure/asset-server-plugin": "2.1.1",
+    "@vendure/core": "2.1.1",
+    "@vendure/email-plugin": "2.1.1",
+    "@vendure/testing": "2.1.1",
+    "@vendure/ui-devkit": "2.1.1",
     "aws-sdk": "2.1099.0",
     "copyfiles": "2.4.1",
     "eslint": "8.0.1",

packages/test/src/compile-admin-ui.util.ts

@@ -0,0 +1,20 @@
+import fs from 'fs';
+import path from 'path';
+import {
+  AdminUiExtension,
+  compileUiExtensions,
+} from '@vendure/ui-devkit/compiler';
+export default async function getFilesInAdminUiFolder(
+  dirname: string,
+  uiExtension: AdminUiExtension
+): Promise<string[]> {
+  fs.rmSync(path.join(dirname, '__admin-ui'), {
+    recursive: true,
+    force: true,
+  });
+  await compileUiExtensions({
+    outputPath: path.join(dirname, '__admin-ui'),
+    extensions: [uiExtension],
+  }).compile?.();
+  return fs.readdirSync(path.join(dirname, '__admin-ui/dist'));
+}

packages/vendure-order-client/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.3.0 (2023-10-24)
+
+- Updated vendure to 2.1.1
+
 # 2.2.0 (2023-10-03)
 
 - Added Eligible Shipping Method store with value, loading state and error([#265](https://github.com/Pinelab-studio/pinelab-vendure-plugins/pull/265))

packages/vendure-order-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-order-client",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "A tiny, framework agnostic client for managing active orders and checkout with Vendure.",
   "author": "Martijn van de Brug <[email protected]>",
   "homepage": "https://pinelab-plugins.com/",

packages/vendure-order-client/test/vendure-order-client.spec.ts

@@ -522,7 +522,7 @@ describe(
 
     afterAll(async () => {
       await server.destroy();
-    });
+    }, 100000);
   },
   { timeout: 10000 }
 );

packages/vendure-plugin-admin-ui-helpers/CHANGELOG.md

@@ -1 +1,3 @@
-// TODO set correct version number + date and the changes you've made connected to the PR. See this example for the correct format: https://github.com/Pinelab-studio/pinelab-vendure-plugins/blob/main/packages/vendure-plugin-invoices/CHANGELOG.md
+# 1.1.0 (2023-10-24)
+
+- Updated vendure to 2.1.1

packages/vendure-plugin-admin-ui-helpers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-admin-ui-helpers",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Vendure plugin for various admin ui helpers. Cancel button, complete order button etc.",
   "author": "Martijn van de Brug <[email protected]>",
   "homepage": "https://pinelab-plugins.com/",

packages/vendure-plugin-coinbase/CHANGELOG.md

@@ -1 +1,3 @@
-// TODO set correct version number + date and the changes you've made connected to the PR. See this example for the correct format: https://github.com/Pinelab-studio/pinelab-vendure-plugins/blob/main/packages/vendure-plugin-invoices/CHANGELOG.md
+# 1.1.0 (2023-10-24)
+
+- Updated vendure to 2.1.1

packages/vendure-plugin-coinbase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-coinbase",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Vendure plugin for Coinbase payments",
   "author": "Martijn van de Brug <[email protected]>",
   "homepage": "https://pinelab-plugins.com/",

packages/vendure-plugin-coinbase/test/coinbase.spec.ts

@@ -64,7 +64,7 @@ describe('Coinbase payments', () => {
 
   afterAll(async () => {
     await server.destroy();
-  });
+  }, 100000);
 
   it('Should start successfully', async () => {
     expect(started).toEqual(true);

packages/vendure-plugin-customer-managed-groups/CHANGELOG.md

@@ -1 +1,3 @@
-// TODO set correct version number + date and the changes you've made connected to the PR. See this example for the correct format: https://github.com/Pinelab-studio/pinelab-vendure-plugins/blob/main/packages/vendure-plugin-invoices/CHANGELOG.md
+# 1.1.0 (2023-10-24)
+
+- Updated vendure to 2.1.1

packages/vendure-plugin-customer-managed-groups/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-customer-managed-groups",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "This plugin allows customer groups to have 'Group admins', that are allowed to fetch placed orders for everyone in the group.",
   "author": "Martijn van de Brug <[email protected]>",
   "homepage": "https://pinelab-plugins.com/",

packages/vendure-plugin-customer-managed-groups/test/customer-managed-groups.spec.ts

@@ -559,5 +559,5 @@ describe('Customer managed groups', function () {
 
   afterAll(async () => {
     await server.destroy();
-  });
+  }, 100000);
 });

packages/vendure-plugin-dutch-postalcode/CHANGELOG.md

@@ -1 +1,3 @@
-// TODO set correct version number + date and the changes you've made connected to the PR. See this example for the correct format: https://github.com/Pinelab-studio/pinelab-vendure-plugins/blob/main/packages/vendure-plugin-invoices/CHANGELOG.md
+# 1.1.0 (2023-10-24)
+
+- Updated vendure to 2.1.1

packages/vendure-plugin-dutch-postalcode/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-dutch-postalcode",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Vendure plugin for retrieving Dutch addresses by postal code via postcode.tech",
   "author": "Martijn van de Brug <[email protected]>",
   "homepage": "https://pinelab-plugins.com/",

packages/vendure-plugin-e-boekhouden/CHANGELOG.md

@@ -1 +1,3 @@
-// TODO set correct version number + date and the changes you've made connected to the PR. See this example for the correct format: https://github.com/Pinelab-studio/pinelab-vendure-plugins/blob/main/packages/vendure-plugin-invoices/CHANGELOG.md
+# 1.1.0 (2023-10-24)
+
+- Updated vendure to 2.1.1

packages/vendure-plugin-e-boekhouden/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-e-boekhouden",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Vendure plugin for integration with the e-boekhouden accounting platform",
   "author": "Martijn van de Brug <[email protected]>",
   "homepage": "https://pinelab-plugins.com/",

packages/vendure-plugin-e-boekhouden/test/e-boekhouden.spec.ts

@@ -29,7 +29,10 @@ import nock from 'nock';
 import { testPaymentMethod } from '../../test/src/test-payment-method';
 import { createSettledOrder } from '../../test/src/shop-utils';
 import { expect, describe, beforeAll, afterAll, it, vi, test } from 'vitest';
-
+import path from 'path';
+import * as fs from 'fs';
+import { compileUiExtensions } from '@vendure/ui-devkit/compiler';
+import getFilesInAdminUiFolder from '../../test/src/compile-admin-ui.util';
 describe('E-boekhouden plugin', function () {
   let server: TestServer;
   let adminClient: SimpleGraphQLClient;
@@ -141,9 +144,17 @@ describe('E-boekhouden plugin', function () {
     expect(payloads[1]).toContain(eBoekhoudenConfig.contraAccount);
   });
 
-  afterAll(() => {
-    return server.destroy();
-  });
+  it('Should compile admin', async () => {
+    const files = await getFilesInAdminUiFolder(
+      __dirname,
+      EBoekhoudenPlugin.ui
+    );
+    expect(files?.length).toBeGreaterThan(0);
+  }, 200000);
+
+  afterAll(async () => {
+    await server.destroy();
+  }, 100000);
 });
 
 const openSessionMock = `<?xml version="1.0" encoding="utf-8"?>

packages/vendure-plugin-goedgepickt/CHANGELOG.md

@@ -1 +1,3 @@
-// TODO set correct version number + date and the changes you've made connected to the PR. See this example for the correct format: https://github.com/Pinelab-studio/pinelab-vendure-plugins/blob/main/packages/vendure-plugin-invoices/CHANGELOG.md
+# 1.1.0 (2023-10-24)
+
+- Updated vendure to 2.1.1

packages/vendure-plugin-goedgepickt/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-goedgepickt",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Vendure plugin for integration with the Goedgepickt order picking platform",
   "author": "Martijn van de Brug <[email protected]>",
   "homepage": "https://pinelab-plugins.com/",

packages/vendure-plugin-goedgepickt/src/goedgepickt.plugin.ts

@@ -17,7 +17,6 @@ import { GoedgepicktConfigEntity } from './api/goedgepickt-config.entity';
 import path from 'path';
 import { AdminUiExtension } from '@vendure/ui-devkit/compiler';
 import { customFields } from './api/custom-fields';
-import { createRawBodyMiddleWare } from '../../util/src/raw-body';
 
 @VendurePlugin({
   imports: [PluginCommonModule],
@@ -35,7 +34,6 @@ import { createRawBodyMiddleWare } from '../../util/src/raw-body';
     resolvers: [GoedgepicktResolver],
   },
   configuration: (config: RuntimeVendureConfig) => {
-    config.apiOptions.middleware.push(createRawBodyMiddleWare('/goedgepickt*'));
     config.shippingOptions.fulfillmentHandlers.push(goedgepicktHandler);
     config.authOptions.customPermissions.push(goedgepicktPermission);
     config.customFields.Order.push(...customFields.Order!);

packages/vendure-plugin-goedgepickt/test/goedgepickt.spec.ts

@@ -46,6 +46,7 @@ import { addItem, createSettledOrder } from '../../test/src/shop-utils';
 import { testPaymentMethod } from '../../test/src/test-payment-method';
 import gql from 'graphql-tag';
 import { expect, describe, beforeAll, afterAll, it, vi, test } from 'vitest';
+import getFilesInAdminUiFolder from '../../test/src/compile-admin-ui.util';
 describe('Goedgepickt plugin', function () {
   const defaultChannelToken = 'e2e-default-channel';
   let server: TestServer;
@@ -398,22 +399,17 @@ describe('Goedgepickt plugin', function () {
     expect(payload).toBeDefined();
   });
 
-  it.skip('Should compile admin', async () => {
-    fs.rmSync(path.join(__dirname, '__admin-ui'), {
-      recursive: true,
-      force: true,
-    });
-    await compileUiExtensions({
-      outputPath: path.join(__dirname, '__admin-ui'),
-      extensions: [GoedgepicktPlugin.ui],
-    }).compile?.();
-    const files = fs.readdirSync(path.join(__dirname, '__admin-ui/dist'));
+  it('Should compile admin', async () => {
+    const files = await getFilesInAdminUiFolder(
+      __dirname,
+      GoedgepicktPlugin.ui
+    );
     expect(files?.length).toBeGreaterThan(0);
-  }, 240000);
+  }, 200000);
 
-  afterAll(() => {
-    return server.destroy();
-  });
+  afterAll(async () => {
+    await server.destroy();
+  }, 100000);
 
   async function findVariantBySku(sku: string): Promise<ProductVariant | null> {
     const ctx = await server.app

packages/vendure-plugin-google-cloud-tasks/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.2.0 (2023-10-24)
+
+- Updated vendure to 2.1.1
+
 # 1.1.2 (2023-09-26)
 
 - Added `onJobFailure` option to inspect errors from failed jobs([#262](https://github.com/Pinelab-studio/pinelab-vendure-plugins/pull/262))

packages/vendure-plugin-google-cloud-tasks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-google-cloud-tasks",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "Vendure plugin for using worker jobs with Google Cloud Tasks",
   "author": "Martijn van de Brug <[email protected]>",
   "homepage": "https://pinelab-plugins.com/",
@@ -24,8 +24,7 @@
     "start": "yarn ts-node test/dev-server.ts"
   },
   "dependencies": {
-    "@google-cloud/tasks": "^3.1.2",
-    "body-parser": "^1.20.2"
+    "@google-cloud/tasks": "^3.1.2"
   },
   "gitHead": "476f36da3aafea41fbf21c70774a30306f1d238f"
 }

packages/vendure-plugin-google-cloud-tasks/src/cloud-tasks.plugin.ts

@@ -4,7 +4,6 @@ import {
   VendurePlugin,
 } from '@vendure/core';
 import { CloudTasksJobQueueStrategy } from './cloud-tasks-job-queue.strategy';
-import { json } from 'body-parser';
 import { CloudTasksHandler } from './cloud-tasks.handler';
 import { CloudTaskOptions, ROUTE } from './types';
 import { JobRecord } from '@vendure/core/dist/plugin/default-job-queue-plugin/job-record.entity';
@@ -17,16 +16,6 @@ import { JobRecord } from '@vendure/core/dist/plugin/default-job-queue-plugin/jo
     config.jobQueueOptions.jobQueueStrategy = new CloudTasksJobQueueStrategy(
       CloudTasksPlugin.options
     );
-    config.apiOptions.middleware = [
-      {
-        route: `/${ROUTE}`,
-        beforeListen: true,
-        handler: json({
-          limit: CloudTasksPlugin.options.bodySizeLimit || '1mb',
-        }),
-      },
-      ...config.apiOptions.middleware,
-    ];
     return config;
   },
   compatibility: '^2.0.0',

packages/vendure-plugin-google-cloud-tasks/test/e2e.spec.ts

@@ -59,10 +59,6 @@ describe('CloudTasks job queue e2e', () => {
     started = true;
   }, 60000);
 
-  afterAll(async () => {
-    await server.destroy();
-  });
-
   it('Should start successfully', async () => {
     expect(started).toBe(true);
   });
@@ -158,4 +154,7 @@ describe('CloudTasks job queue e2e', () => {
     );
     expect(res.status).toBe(200);
   });
+  afterAll(async () => {
+    await server.destroy();
+  }, 100000);
 });

packages/vendure-plugin-google-storage-assets/CHANGELOG.md

@@ -0,0 +1,3 @@
+# 1.1.0 (2023-10-24)
+
+- Updated vendure to 2.1.1

packages/vendure-plugin-google-storage-assets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-google-storage-assets",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Vendure plugin for uploading assets to Google storage",
   "author": "Martijn van de Brug <[email protected]>",
   "homepage": "https://pinelab-plugins.com/",

packages/vendure-plugin-invoices/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.2.0 (2023-10-24)
+
+- Updated vendure to 2.1.1
+
 # 1.1.0 (2023-08-14)
 
 - Allow specifying invoice template storage in DB by specifying DB engine: INVOICES_PLUGIN_DB_ENGINE=mysql ([#243](https://github.com/Pinelab-studio/pinelab-vendure-plugins/pull/243))

packages/vendure-plugin-invoices/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-invoices",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "Vendure plugin for invoice generation",
   "author": "Martijn van de Brug <[email protected]>",
   "homepage": "https://pinelab-plugins.com/",

packages/vendure-plugin-invoices/test/e2e.spec.ts

@@ -34,6 +34,10 @@ import {
   getConfigQuery,
   upsertConfigMutation,
 } from '../src/ui/queries.graphql';
+import path from 'path';
+import * as fs from 'fs';
+import { compileUiExtensions } from '@vendure/ui-devkit/compiler';
+import getFilesInAdminUiFolder from '../../test/src/compile-admin-ui.util';
 
 describe('Invoices plugin', function () {
   let server: TestServer;
@@ -112,7 +116,7 @@ describe('Invoices plugin', function () {
 
   it('Gets all invoices after 3s', async () => {
     // Give the worker some time to process
-    await new Promise((resolve) => setTimeout(resolve, 3000));
+    await new Promise((resolve) => setTimeout(resolve, 4000));
     const result = await adminClient.query<InvoicesQuery>(getAllInvoicesQuery);
     invoice = result.invoices.items[0];
     expect(result.invoices.totalItems).toBe(1);
@@ -131,7 +135,7 @@ describe('Invoices plugin', function () {
       await server.app
         .get(InvoiceService)
         .createAndSaveInvoice(channel.id as string, invoice.orderCode);
-    } catch (e) {
+    } catch (e: any) {
       expect(e.message).toContain('was already created');
     }
   });
@@ -165,7 +169,7 @@ describe('Invoices plugin', function () {
 
   it('Has incremental invoice number', async () => {
     await createSettledOrder(shopClient as any, 3);
-    await new Promise((resolve) => setTimeout(resolve, 2000));
+    await new Promise((resolve) => setTimeout(resolve, 4000));
     const result = await adminClient.query<InvoicesQuery>(getAllInvoicesQuery);
     const newInvoice = result.invoices.items[0];
     const oldInvoice = result.invoices.items[1];
@@ -200,7 +204,12 @@ describe('Invoices plugin', function () {
     expect(res.status).toBe(403);
   });
 
-  afterAll(() => {
-    return server.destroy();
-  });
+  it('Should compile admin', async () => {
+    const files = await getFilesInAdminUiFolder(__dirname, InvoicePlugin.ui);
+    expect(files?.length).toBeGreaterThan(0);
+  }, 200000);
+
+  afterAll(async () => {
+    await server.destroy();
+  }, 100000);
 });