From b2814076305d4c603182b4f73a329d0b19cf57df Mon Sep 17 00:00:00 2001 From: Martijn Date: Tue, 22 Aug 2023 10:16:24 +0200 Subject: [PATCH 1/6] feat(picqer): added logging, updated vendure and enabled disabled tests again --- package.json | 40 +++---- .../src/api/picqer.client.ts | 8 +- .../src/api/picqer.service.ts | 1 + .../vendure-plugin-picqer/test/picqer.spec.ts | 35 +----- yarn.lock | 108 +++++++++++++----- 5 files changed, 107 insertions(+), 85 deletions(-) diff --git a/package.json b/package.json index 2be4cb7b..ec507695 100644 --- a/package.json +++ b/package.json @@ -20,19 +20,28 @@ "remove-node-modules": "find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +" }, "devDependencies": { - "@graphql-codegen/cli": "2.6.2", "@commitlint/cli": "17.2.0", "@commitlint/config-conventional": "17.2.0", - "@graphql-codegen/typescript-document-nodes": "2.2.8", + "@google-cloud/storage": "5.18.2", + "@graphql-codegen/cli": "2.6.2", "@graphql-codegen/typed-document-node": "^5.0.1", + "@graphql-codegen/typescript-document-nodes": "2.2.8", "@graphql-codegen/typescript-operations": "2.3.5", "@graphql-codegen/typescript": "2.4.8", + "@nestjs/cli": "8.2.4", + "@rollup/plugin-typescript": "11.0.0", + "@swc/core": "1.3.59", + "@types/adm-zip": "0.4.34", + "@types/sharp": "0.28.0", + "@types/tmp": "0.2.3", "@typescript-eslint/eslint-plugin": "5.43.0", - "@vendure/admin-ui-plugin": "2.0.4", - "@vendure/core": "2.0.4", - "@vendure/testing": "2.0.4", - "@vendure/ui-devkit": "2.0.4", - "@vendure/email-plugin": "2.0.4", + "@vendure/admin-ui-plugin": "2.0.6", + "@vendure/asset-server-plugin": "2.0.6", + "@vendure/core": "2.0.6", + "@vendure/email-plugin": "2.0.6", + "@vendure/testing": "2.0.6", + "@vendure/ui-devkit": "2.0.6", + "aws-sdk": "2.1099.0", "copyfiles": "2.4.1", "eslint-config-prettier": "8.8.0", "eslint-config-standard-with-typescript": "34.0.1", @@ -43,25 +52,16 @@ "graphql-tag": "2.12.6", "husky": "8.0.2", "lerna": "6.0.3", + "nock": "13.2.4", "nodemon": "2.0.15", "prettier": "2.8.7", "rimraf": "3.0.2", + "rollup": "3.19.0", "ts-node": "10.7.0", "typescript": "4.9.5", - "vitest": "0.30.1", - "@nestjs/cli": "8.2.4", - "@swc/core": "1.3.59", - "nock": "13.2.4", "unplugin-swc": "1.3.2", - "@rollup/plugin-typescript": "11.0.0", - "@vendure/asset-server-plugin": "2.0.4", - "rollup": "3.19.0", - "wsdl-tsclient": "1.3.1", - "@types/sharp": "0.28.0", - "@types/tmp": "0.2.3", - "@google-cloud/storage": "5.18.2", - "@types/adm-zip": "0.4.34", - "aws-sdk": "2.1099.0" + "vitest": "0.30.1", + "wsdl-tsclient": "1.3.1" }, "commitlint": { "extends": [ diff --git a/packages/vendure-plugin-picqer/src/api/picqer.client.ts b/packages/vendure-plugin-picqer/src/api/picqer.client.ts index 85322455..72fbaef0 100644 --- a/packages/vendure-plugin-picqer/src/api/picqer.client.ts +++ b/packages/vendure-plugin-picqer/src/api/picqer.client.ts @@ -242,15 +242,15 @@ export class PicqerClient { ): Promise { const product = await this.getProductByCode(sku); if (!product) { - Logger.info( - `Product '${sku}' not found, creating new product`, + Logger.debug( + `Product '${sku}' not found, creating new product in Picqer`, loggerCtx ); return this.createProduct(input); } const productId = product.idproduct; - Logger.info( - `Existing product '${productId}' found, updating product ${productId}`, + Logger.debug( + `Existing product '${productId}' found, updating product ${productId} in Picqer`, loggerCtx ); return this.updateProduct(productId, input); diff --git a/packages/vendure-plugin-picqer/src/api/picqer.service.ts b/packages/vendure-plugin-picqer/src/api/picqer.service.ts index a7bac28d..20ecedfb 100644 --- a/packages/vendure-plugin-picqer/src/api/picqer.service.ts +++ b/packages/vendure-plugin-picqer/src/api/picqer.service.ts @@ -140,6 +140,7 @@ export class PicqerService implements OnApplicationBootstrap { loggerCtx ); } + Logger.info(`Successfully handled job '${data.action}'`, loggerCtx); } catch (e: unknown) { if (e instanceof Error) { // Only log a warning, because this is a background function that will be retried by the JobQueue diff --git a/packages/vendure-plugin-picqer/test/picqer.spec.ts b/packages/vendure-plugin-picqer/test/picqer.spec.ts index f2412efe..d7140bdc 100644 --- a/packages/vendure-plugin-picqer/test/picqer.spec.ts +++ b/packages/vendure-plugin-picqer/test/picqer.spec.ts @@ -244,8 +244,7 @@ describe('Picqer plugin', function () { }); }); - // FIXME enable after fix: https://github.com/vendure-ecommerce/vendure/issues/2191 - it.skip('Should update to "PartiallyDelivered" when 2 of 3 items are shipped', async () => { + it('Should update to "PartiallyDelivered" when 2 of 3 items are shipped', async () => { const mockIncomingWebhook = { event: 'picklists.closed', data: { @@ -272,8 +271,7 @@ describe('Picqer plugin', function () { expect(order!.state).toBe('PartiallyDelivered'); }); - // FIXME enable after fix: https://github.com/vendure-ecommerce/vendure/issues/2191 - it.skip('Should have updated stock after 1 item was shipped', async () => { + it('Should have updated stock after 1 item was shipped', async () => { const variant = (await getAllVariants(adminClient)).find( (v) => v.id === 'T_1' ); @@ -281,8 +279,7 @@ describe('Picqer plugin', function () { expect(variant!.stockAllocated).toBe(1); }); - // FIXME enable after fix: https://github.com/vendure-ecommerce/vendure/issues/2191 - it.skip('Should update to "Delivered" when 3 of 3 items are shipped', async () => { + it('Should update to "Delivered" when 3 of 3 items are shipped', async () => { const mockIncomingWebhook = { event: 'picklists.closed', data: { @@ -309,32 +306,6 @@ describe('Picqer plugin', function () { expect(order!.state).toBe('Delivered'); }); - // FIXME Delete this test after fix: https://github.com/vendure-ecommerce/vendure/issues/2191 - it('Should update to "Delivered" when items are shipped', async () => { - const mockIncomingWebhook = { - event: 'picklists.closed', - data: { - reference: createdOrder?.code, - products: [{ productcode: 'L2201308', amountpicked: 3 }], - }, - } as Partial; - await adminClient.fetch( - `http://localhost:3050/picqer/hooks/${E2E_DEFAULT_CHANNEL_TOKEN}`, - { - method: 'POST', - body: JSON.stringify(mockIncomingWebhook), - headers: { - 'X-Picqer-Signature': createSignature( - mockIncomingWebhook, - 'test-api-key' - ), - }, - } - ); - const order = await getOrder(adminClient, createdOrder?.id as string); - expect(order!.state).toBe('Delivered'); - }); - it('Should have updated stock after all items are shipped', async () => { const variant = (await getAllVariants(adminClient)).find( (v) => v.id === 'T_1' diff --git a/yarn.lock b/yarn.lock index 0ce6acdf..8d3435d6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5012,18 +5012,18 @@ "@typescript-eslint/types" "5.58.0" eslint-visitor-keys "^3.3.0" -"@vendure/admin-ui-plugin@2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@vendure/admin-ui-plugin/-/admin-ui-plugin-2.0.4.tgz#7e7c0c3fa76c1e5025105049fba1bb3cdf864904" - integrity sha512-+Ivc4LTM5KGwMrYQcTv2CooSZIOMD/lS53K9D46kAdxTjXP8YI/AMfLq35LRvBXiixZ2SIJRW7Um1Ze7FtbqbQ== +"@vendure/admin-ui-plugin@2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@vendure/admin-ui-plugin/-/admin-ui-plugin-2.0.6.tgz#2f96f670d18f03f716724e6b92cb876297a9232b" + integrity sha512-0aQTiMspNu/Zi/DD7b7ueMjRHDMocdveqGV0gEWXpcQ8J783AUmvXIOs7PwdP7/1aBLDAGm3LGyfjohFHiEmWg== dependencies: date-fns "^2.30.0" fs-extra "^10.0.0" -"@vendure/admin-ui@^2.0.4": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@vendure/admin-ui/-/admin-ui-2.0.5.tgz#d1e3a3f241410c2cd20548358691d8abe5b4175a" - integrity sha512-UdVJNP2aFuzuFgR4kdon7STlHd9UWUen/w1A8tO1S46J8WuOCn08mNtX82WTcl9bloByMer4CGv99wz46VVtzw== +"@vendure/admin-ui@^2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@vendure/admin-ui/-/admin-ui-2.0.6.tgz#9bbc591e711fc5ea3420b665744b2c61c1e40883" + integrity sha512-VCXV6f6Q6GsUVQNfKYo+N2Rs+R/cqOrG6wNEdUmSGGqUjKpq8djM79cAzAJCtCyA03jG7p+0QAd/kFZwLZmQ8g== dependencies: "@angular/animations" "^16.0.3" "@angular/cdk" "^16.0.2" @@ -5045,7 +5045,7 @@ "@ng-select/ng-select" "^11.0.0" "@ngx-translate/core" "^14.0.0" "@ngx-translate/http-loader" "^7.0.0" - "@vendure/common" "^2.0.5" + "@vendure/common" "^2.0.6" "@webcomponents/custom-elements" "^1.5.1" apollo-angular "^5.0.0" apollo-upload-client "^17.0.0" @@ -5073,10 +5073,10 @@ tslib "^2.5.0" zone.js "~0.13.0" -"@vendure/asset-server-plugin@2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@vendure/asset-server-plugin/-/asset-server-plugin-2.0.4.tgz#9a1f6289da493ef1e9cef7d9d90f5b93ce53dc04" - integrity sha512-PNIQJ1pROwrjPy7mGxCYQdazFHwQIFQiEAu7/LjlX9YGonWa71aEGQ5CwSHXnGXE/kEt6bzPExQaeZyBY0L5Lg== +"@vendure/asset-server-plugin@2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@vendure/asset-server-plugin/-/asset-server-plugin-2.0.6.tgz#62009d5ca8b02d1a2339f015a38baa06b335d215" + integrity sha512-xmt1S61WC+M0MrRKl7kuS9KPkuCN0SCucN2fpAHXd2EbbDkdNDd+WKcMeAdzmeaeST0EBI7EkyJX1kEil7Lm/A== dependencies: file-type "^16.5.3" fs-extra "^10.0.0" @@ -5087,11 +5087,16 @@ resolved "https://registry.yarnpkg.com/@vendure/common/-/common-2.0.4.tgz#60c3972ecedca920afb4867ccf6ba085358caabb" integrity sha512-G77FlfKxbwX+CNyh2L4q3OrtY3r9riAsVCTEvWzrqNONxQazHsl01tyzWQYE1u/npYKmozEUU8VneejvE9/zyA== -"@vendure/common@^2.0.4", "@vendure/common@^2.0.5": +"@vendure/common@^2.0.4": version "2.0.5" resolved "https://registry.yarnpkg.com/@vendure/common/-/common-2.0.5.tgz#99e3135d41a698865a1eecbf80e2c70b0f6b1794" integrity sha512-S4kYKNwJM9DL5TlNZe9aJ3EiK5YPj6zXUqj0ebsQ+HJRHHarO8OK2oj964WprZNwCJDMbZItPzPTIPutnb915g== +"@vendure/common@^2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@vendure/common/-/common-2.0.6.tgz#4c71aedc30f13afe4f9938798a256aa5ab43aed6" + integrity sha512-/xdrTdKk5b4nZYGSzJKlYlVTxap2yaxPcE1bVTDdiDyse/wqIbkd76nIlCaYouVce80/3kTFj0nJaSR2QXjhDA== + "@vendure/core@2.0.4": version "2.0.4" resolved "https://registry.yarnpkg.com/@vendure/core/-/core-2.0.4.tgz#51b81105ef547c7a13397f03df3fdde16c9d76ff" @@ -5137,10 +5142,55 @@ rxjs "^7.5.4" typeorm "0.3.11" -"@vendure/email-plugin@2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@vendure/email-plugin/-/email-plugin-2.0.4.tgz#7b32c136039b0409e1945ec5fcfc6c1430ee85e2" - integrity sha512-Lh/oRJmm4GfQQ43xhnpio3UY34NTyuSmxzKVK/pccEu6VVnU9zSht4Iu9Q/rWI1MezSfYcHKYX7w+YLnuwjtjw== +"@vendure/core@2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@vendure/core/-/core-2.0.6.tgz#edd507387b38024445a6761ba22bac00c9f643de" + integrity sha512-5s+OLOoCxFgKmbz8xBRr7BQyuwvnMpBvKUlr1kLPoo4njY5vv3lXm/poYYloc3A1WELAa5fn28RNwfMQobBU4A== + dependencies: + "@graphql-tools/stitch" "^8.7.43" + "@nestjs/apollo" "^10.2.0" + "@nestjs/common" "9.3.9" + "@nestjs/core" "9.3.9" + "@nestjs/graphql" "10.2.0" + "@nestjs/platform-express" "9.3.9" + "@nestjs/terminus" "9.2.1" + "@nestjs/testing" "9.3.9" + "@nestjs/typeorm" "9.0.1" + "@types/fs-extra" "^9.0.1" + "@vendure/common" "^2.0.6" + apollo-server-express "3.6.3" + bcrypt "^5.1.0" + body-parser "^1.19.0" + chalk "^4.1.0" + commander "^7.1.0" + cookie-session "^2.0.0-rc.1" + csv-parse "^4.12.0" + express "^4.17.1" + fs-extra "^10.0.0" + graphql "16.6.0" + graphql-fields "^2.0.3" + graphql-scalars "^1.20.1" + graphql-tag "^2.12.6" + graphql-upload "^16.0.2" + http-proxy-middleware "^2.0.1" + i18next "^23.2.6" + i18next-fs-backend "^2.1.5" + i18next-http-middleware "^3.3.2" + i18next-icu "^2.3.0" + image-size "^1.0.0" + intl-messageformat "^10.5.0" + mime-types "^2.1.27" + ms "^2.1.2" + nanoid "^3.1.23" + progress "^2.0.3" + reflect-metadata "^0.1.13" + rxjs "^7.5.4" + typeorm "0.3.11" + +"@vendure/email-plugin@2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@vendure/email-plugin/-/email-plugin-2.0.6.tgz#f57804a0bc7157fad484e3c70f40f40940a741b0" + integrity sha512-EydX63vbTXOI8zzVo7/mCCAJW4vb4MLl+AFMXxeIPmqpfDJr2PmpSTj0M13scM77S0mpf1P8PdIJIpUMhpTc4g== dependencies: "@types/nodemailer" "^6.4.0" dateformat "^3.0.3" @@ -5150,14 +5200,14 @@ mjml "^4.7.1" nodemailer "^6.4.13" -"@vendure/testing@2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@vendure/testing/-/testing-2.0.4.tgz#1bdd5eedc60f6d9838c4e0656f17cc1dfb17ec8c" - integrity sha512-PW0PiMwgLBOy7kaFnV1NrCPkMCwefBdIZKwnf9fvaXso0KUreZqKpjRYh7dCYhw1dAfUObPzoHcdp+hRsnqetg== +"@vendure/testing@2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@vendure/testing/-/testing-2.0.6.tgz#60071b2cf484f71fbc80a0292846b010e054c882" + integrity sha512-RQWUVGF/PxnW0BVHNpbKfEPQOYFvN65cM3u/H69Z92XWAH3hi90AAzuVGMxJxRdT01a4165OrQtJ4YUyKZhL0w== dependencies: "@graphql-typed-document-node/core" "^3.2.0" "@types/node-fetch" "^2.5.4" - "@vendure/common" "^2.0.4" + "@vendure/common" "^2.0.6" faker "^4.1.0" form-data "^3.0.0" graphql "16.6.0" @@ -5165,17 +5215,17 @@ node-fetch "^2.6.0" sql.js "1.8.0" -"@vendure/ui-devkit@2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@vendure/ui-devkit/-/ui-devkit-2.0.4.tgz#37a5cd45c8e845aea1d4a89a56d67fdb5049778d" - integrity sha512-sFpWHDqD47t7LlMW9zCtoqYXwvG0jJ5c0lxrvBiPl+veF404pYWd6hBGCB7x03cWPrk+YEDsw8r5SHrb/8pcIw== +"@vendure/ui-devkit@2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@vendure/ui-devkit/-/ui-devkit-2.0.6.tgz#b4463d198597e237efbac0e6bd80d1e68a830c7a" + integrity sha512-CRQeox2W3snRRIA4z94M72fiZnt91jS+fc6woKBbem20DEUmDC2F7XEWjwED+jaGTkGbpON5f0wW5kj09GvQKw== dependencies: "@angular-devkit/build-angular" "^16.0.3" "@angular/cli" "^16.0.3" "@angular/compiler" "^16.0.3" "@angular/compiler-cli" "^16.0.3" - "@vendure/admin-ui" "^2.0.4" - "@vendure/common" "^2.0.4" + "@vendure/admin-ui" "^2.0.6" + "@vendure/common" "^2.0.6" chalk "^4.1.0" chokidar "^3.5.1" fs-extra "^10.0.0" From bb690967529bc696b5f82f0f388ea2d5c6c34e82 Mon Sep 17 00:00:00 2001 From: Martijn Date: Tue, 22 Aug 2023 10:16:46 +0200 Subject: [PATCH 2/6] feat(picqer): version bump --- packages/vendure-plugin-picqer/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vendure-plugin-picqer/package.json b/packages/vendure-plugin-picqer/package.json index 16387a6e..c8291afa 100644 --- a/packages/vendure-plugin-picqer/package.json +++ b/packages/vendure-plugin-picqer/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-picqer", - "version": "1.0.4", + "version": "1.0.5", "description": "Vendure plugin syncing to orders and stock with Picqer", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", From 50e2f4a34467a7a6900a79834b87ae74f83678be Mon Sep 17 00:00:00 2001 From: Martijn Date: Tue, 22 Aug 2023 10:20:03 +0200 Subject: [PATCH 3/6] feat: lerna independent --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 9985640a..46542744 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.1", + "version": "independent", "lerna": "2.0.0", "npmClient": "yarn", "useWorkspaces": true From d98f7064dabb4a718a9b924a63855ead4ebf4292 Mon Sep 17 00:00:00 2001 From: Martijn Date: Tue, 22 Aug 2023 10:23:49 +0200 Subject: [PATCH 4/6] feat: lerna independent versioning and bumped all patch --- packages/test/package.json | 2 +- packages/util/package.json | 2 +- packages/vendure-order-client/package.json | 2 +- packages/vendure-plugin-admin-ui-helpers/package.json | 2 +- packages/vendure-plugin-coinbase/package.json | 2 +- packages/vendure-plugin-customer-managed-groups/package.json | 2 +- packages/vendure-plugin-dutch-postalcode/package.json | 2 +- packages/vendure-plugin-e-boekhouden/package.json | 2 +- packages/vendure-plugin-goedgepickt/package.json | 2 +- packages/vendure-plugin-google-cloud-tasks/package.json | 2 +- packages/vendure-plugin-google-storage-assets/package.json | 2 +- packages/vendure-plugin-invoices/package.json | 2 +- packages/vendure-plugin-limit-variant-per-order/package.json | 2 +- packages/vendure-plugin-metrics/package.json | 2 +- packages/vendure-plugin-modify-customer-orders/package.json | 2 +- .../vendure-plugin-multiserver-db-sessioncache/package.json | 2 +- packages/vendure-plugin-myparcel/package.json | 2 +- packages/vendure-plugin-order-export/package.json | 2 +- packages/vendure-plugin-picqer/package.json | 2 +- packages/vendure-plugin-popularity-scores/package.json | 2 +- packages/vendure-plugin-sendcloud/package.json | 2 +- .../vendure-plugin-shipping-by-weight-and-country/package.json | 2 +- packages/vendure-plugin-stock-monitoring/package.json | 2 +- packages/vendure-plugin-stripe-subscription/package.json | 2 +- packages/vendure-plugin-variant-bulk-update/package.json | 2 +- packages/vendure-plugin-webhook/package.json | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/test/package.json b/packages/test/package.json index fe5b3bca..99a45845 100644 --- a/packages/test/package.json +++ b/packages/test/package.json @@ -1,6 +1,6 @@ { "name": "test-utils", - "version": "1.0.1", + "version": "1.0.2", "main": "index.ts", "license": "MIT", "private": true, diff --git a/packages/util/package.json b/packages/util/package.json index fb5e2e5c..f5ce1676 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -1,6 +1,6 @@ { "name": "utils", - "version": "1.0.1", + "version": "1.0.2", "main": "index.ts", "license": "MIT", "private": true, diff --git a/packages/vendure-order-client/package.json b/packages/vendure-order-client/package.json index 7ef25aa4..3cacf41e 100644 --- a/packages/vendure-order-client/package.json +++ b/packages/vendure-order-client/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-order-client", - "version": "1.0.1", + "version": "1.0.2", "description": "A tiny, framework agnostic client for managing active orders and checkout with Vendure.", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-admin-ui-helpers/package.json b/packages/vendure-plugin-admin-ui-helpers/package.json index a6f842c6..abe6131e 100644 --- a/packages/vendure-plugin-admin-ui-helpers/package.json +++ b/packages/vendure-plugin-admin-ui-helpers/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-admin-ui-helpers", - "version": "1.0.1", + "version": "1.0.2", "description": "Vendure plugin for various admin ui helpers. Cancel button, complete order button etc.", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-coinbase/package.json b/packages/vendure-plugin-coinbase/package.json index 0565de83..82131dd8 100644 --- a/packages/vendure-plugin-coinbase/package.json +++ b/packages/vendure-plugin-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-coinbase", - "version": "1.0.1", + "version": "1.0.2", "description": "Vendure plugin for Coinbase payments", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-customer-managed-groups/package.json b/packages/vendure-plugin-customer-managed-groups/package.json index 20021812..895b70b0 100644 --- a/packages/vendure-plugin-customer-managed-groups/package.json +++ b/packages/vendure-plugin-customer-managed-groups/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-customer-managed-groups", - "version": "1.0.1", + "version": "1.0.2", "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 ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-dutch-postalcode/package.json b/packages/vendure-plugin-dutch-postalcode/package.json index 77457963..fcdbb2f6 100644 --- a/packages/vendure-plugin-dutch-postalcode/package.json +++ b/packages/vendure-plugin-dutch-postalcode/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-dutch-postalcode", - "version": "1.0.1", + "version": "1.0.2", "description": "Vendure plugin for retrieving Dutch addresses by postal code via postcode.tech", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-e-boekhouden/package.json b/packages/vendure-plugin-e-boekhouden/package.json index 6c917ee2..51daf989 100644 --- a/packages/vendure-plugin-e-boekhouden/package.json +++ b/packages/vendure-plugin-e-boekhouden/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-e-boekhouden", - "version": "1.0.1", + "version": "1.0.2", "description": "Vendure plugin for integration with the e-boekhouden accounting platform", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-goedgepickt/package.json b/packages/vendure-plugin-goedgepickt/package.json index e66d8d8f..451cb428 100644 --- a/packages/vendure-plugin-goedgepickt/package.json +++ b/packages/vendure-plugin-goedgepickt/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-goedgepickt", - "version": "1.0.1", + "version": "1.0.2", "description": "Vendure plugin for integration with the Goedgepickt order picking platform", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-google-cloud-tasks/package.json b/packages/vendure-plugin-google-cloud-tasks/package.json index 4f2bbbfe..8d059721 100644 --- a/packages/vendure-plugin-google-cloud-tasks/package.json +++ b/packages/vendure-plugin-google-cloud-tasks/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-google-cloud-tasks", - "version": "1.1.0", + "version": "1.1.1", "description": "Vendure plugin for using worker jobs with Google Cloud Tasks", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-google-storage-assets/package.json b/packages/vendure-plugin-google-storage-assets/package.json index 7d1f7726..4d17f239 100644 --- a/packages/vendure-plugin-google-storage-assets/package.json +++ b/packages/vendure-plugin-google-storage-assets/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-google-storage-assets", - "version": "1.0.1", + "version": "1.0.2", "description": "Vendure plugin for uploading assets to Google storage", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-invoices/package.json b/packages/vendure-plugin-invoices/package.json index 33097ee8..e5ac0e8e 100644 --- a/packages/vendure-plugin-invoices/package.json +++ b/packages/vendure-plugin-invoices/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-invoices", - "version": "1.1.1", + "version": "1.1.2", "description": "Vendure plugin for invoice generation", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-limit-variant-per-order/package.json b/packages/vendure-plugin-limit-variant-per-order/package.json index 220d5d35..9166faa1 100644 --- a/packages/vendure-plugin-limit-variant-per-order/package.json +++ b/packages/vendure-plugin-limit-variant-per-order/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-limit-variant-per-order", - "version": "1.0.1", + "version": "1.0.2", "description": "Vendure plugin to limit the amount of a specific product that can be ordered per order.", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-metrics/package.json b/packages/vendure-plugin-metrics/package.json index a7f86e02..ac9d4c0f 100644 --- a/packages/vendure-plugin-metrics/package.json +++ b/packages/vendure-plugin-metrics/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-metrics", - "version": "1.0.1", + "version": "1.0.2", "description": "Vendure plugin measuring and visualizing e-commerce metrics", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-modify-customer-orders/package.json b/packages/vendure-plugin-modify-customer-orders/package.json index f32b2494..b9e47599 100644 --- a/packages/vendure-plugin-modify-customer-orders/package.json +++ b/packages/vendure-plugin-modify-customer-orders/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-modify-customer-orders", - "version": "1.0.1", + "version": "1.0.2", "description": "Vendure plugin for converting Active orders to Draft", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-multiserver-db-sessioncache/package.json b/packages/vendure-plugin-multiserver-db-sessioncache/package.json index 6fb21d8e..771ccac3 100644 --- a/packages/vendure-plugin-multiserver-db-sessioncache/package.json +++ b/packages/vendure-plugin-multiserver-db-sessioncache/package.json @@ -1,7 +1,7 @@ { "name": "@pinelab/vendure-plugin-multiserver-db-sessioncache", "description": "An implementation of Vendure's SessionCacheStrategy that caches session in the database", - "version": "1.0.1", + "version": "1.0.2", "author": "Surafel Melese Tariku ", "homepage": "https://pinelab-plugins.com/", "repository": "https://github.com/Pinelab-studio/pinelab-vendure-plugins", diff --git a/packages/vendure-plugin-myparcel/package.json b/packages/vendure-plugin-myparcel/package.json index cbe9afb2..ef38371e 100644 --- a/packages/vendure-plugin-myparcel/package.json +++ b/packages/vendure-plugin-myparcel/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-myparcel", - "version": "1.0.1", + "version": "1.0.2", "description": "Vendure plugin for MyParcel fulfillment", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-order-export/package.json b/packages/vendure-plugin-order-export/package.json index 14a87c01..675a057d 100644 --- a/packages/vendure-plugin-order-export/package.json +++ b/packages/vendure-plugin-order-export/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-order-export", - "version": "1.0.1", + "version": "1.0.2", "description": "Vendure plugin for exporting orders to a file", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-picqer/package.json b/packages/vendure-plugin-picqer/package.json index c8291afa..63b7132f 100644 --- a/packages/vendure-plugin-picqer/package.json +++ b/packages/vendure-plugin-picqer/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-picqer", - "version": "1.0.5", + "version": "1.0.6", "description": "Vendure plugin syncing to orders and stock with Picqer", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-popularity-scores/package.json b/packages/vendure-plugin-popularity-scores/package.json index 378db710..75952d40 100644 --- a/packages/vendure-plugin-popularity-scores/package.json +++ b/packages/vendure-plugin-popularity-scores/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-popularity-scores", - "version": "1.0.1", + "version": "1.0.2", "description": "Sort products and collections by popularity based on previously placed orders", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-sendcloud/package.json b/packages/vendure-plugin-sendcloud/package.json index 4d210dba..1877b9b6 100644 --- a/packages/vendure-plugin-sendcloud/package.json +++ b/packages/vendure-plugin-sendcloud/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-sendcloud", - "version": "1.0.1", + "version": "1.0.2", "description": "Vendure plugin for syncing orders with SendCloud", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-shipping-by-weight-and-country/package.json b/packages/vendure-plugin-shipping-by-weight-and-country/package.json index c02e042d..e48205cf 100644 --- a/packages/vendure-plugin-shipping-by-weight-and-country/package.json +++ b/packages/vendure-plugin-shipping-by-weight-and-country/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-shipping-by-weight-and-country", - "version": "1.0.1", + "version": "1.0.2", "description": "Vendure plugin for selecting a shipping method based on the total weight and the shipping address of an order.", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-stock-monitoring/package.json b/packages/vendure-plugin-stock-monitoring/package.json index 0680163c..121ea493 100644 --- a/packages/vendure-plugin-stock-monitoring/package.json +++ b/packages/vendure-plugin-stock-monitoring/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-stock-monitoring", - "version": "1.0.1", + "version": "1.0.2", "description": "Vendure plugin for monitoring stock levels through a widget or by email", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-stripe-subscription/package.json b/packages/vendure-plugin-stripe-subscription/package.json index 7bcb7c16..fa163781 100644 --- a/packages/vendure-plugin-stripe-subscription/package.json +++ b/packages/vendure-plugin-stripe-subscription/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-stripe-subscription", - "version": "1.3.0", + "version": "1.3.1", "description": "Vendure plugin for selling subscriptions via Stripe", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-variant-bulk-update/package.json b/packages/vendure-plugin-variant-bulk-update/package.json index acb4436f..9faf8313 100644 --- a/packages/vendure-plugin-variant-bulk-update/package.json +++ b/packages/vendure-plugin-variant-bulk-update/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-variant-bulk-update", - "version": "1.0.1", + "version": "1.0.2", "description": "Vendure plugin to bulk update all variants of a product", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", diff --git a/packages/vendure-plugin-webhook/package.json b/packages/vendure-plugin-webhook/package.json index 54c08f98..fc64acfe 100644 --- a/packages/vendure-plugin-webhook/package.json +++ b/packages/vendure-plugin-webhook/package.json @@ -1,6 +1,6 @@ { "name": "@pinelab/vendure-plugin-webhook", - "version": "1.0.1", + "version": "1.0.2", "description": "Call webhooks based on configured events from Vendure", "author": "Martijn van de Brug ", "homepage": "https://pinelab-plugins.com/", From 7c829be64672831bef91db0bf4dba4fa3cadbc05 Mon Sep 17 00:00:00 2001 From: Martijn Date: Tue, 22 Aug 2023 10:25:09 +0200 Subject: [PATCH 5/6] feat: lerna version script --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index ec507695..e9270e22 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,8 @@ "lint:check": "yarn prettier --check . && yarn lint .", "lint:fix": "yarn prettier --write . && yarn lint --fix .", "upgrade:vendure": "yarn lerna exec --concurrency 1 \"yarn upgrade --pattern @vendure --latest\"", - "remove-node-modules": "find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +" + "remove-node-modules": "find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +", + "bump-all-versions": "lerna version --no-git-tag-version" }, "devDependencies": { "@commitlint/cli": "17.2.0", From 148d320859bdbe71fbf34d312e47f9a64b2b47e7 Mon Sep 17 00:00:00 2001 From: Martijn Date: Tue, 22 Aug 2023 10:35:44 +0200 Subject: [PATCH 6/6] feat: removed deps --- packages/test/package.json | 3 +- packages/util/package.json | 7 +---- yarn.lock | 57 +------------------------------------- 3 files changed, 3 insertions(+), 64 deletions(-) diff --git a/packages/test/package.json b/packages/test/package.json index 99a45845..2fa5b10b 100644 --- a/packages/test/package.json +++ b/packages/test/package.json @@ -6,7 +6,6 @@ "private": true, "scripts": { "generate": "graphql-codegen --config codegen.yml", - "start": "ts-node ./src/dev-server.ts", - "build": "tsc" + "start": "ts-node ./src/dev-server.ts" } } diff --git a/packages/util/package.json b/packages/util/package.json index f5ce1676..141058b3 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -3,10 +3,5 @@ "version": "1.0.2", "main": "index.ts", "license": "MIT", - "private": true, - "devDependencies": { - "@vendure/common": "2.0.4", - "@vendure/core": "2.0.4", - "ts-node": "^10.9.1" - } + "private": true } diff --git a/yarn.lock b/yarn.lock index 8d3435d6..f16f2d48 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5082,66 +5082,11 @@ fs-extra "^10.0.0" sharp "~0.32.1" -"@vendure/common@2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@vendure/common/-/common-2.0.4.tgz#60c3972ecedca920afb4867ccf6ba085358caabb" - integrity sha512-G77FlfKxbwX+CNyh2L4q3OrtY3r9riAsVCTEvWzrqNONxQazHsl01tyzWQYE1u/npYKmozEUU8VneejvE9/zyA== - -"@vendure/common@^2.0.4": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@vendure/common/-/common-2.0.5.tgz#99e3135d41a698865a1eecbf80e2c70b0f6b1794" - integrity sha512-S4kYKNwJM9DL5TlNZe9aJ3EiK5YPj6zXUqj0ebsQ+HJRHHarO8OK2oj964WprZNwCJDMbZItPzPTIPutnb915g== - "@vendure/common@^2.0.6": version "2.0.6" resolved "https://registry.yarnpkg.com/@vendure/common/-/common-2.0.6.tgz#4c71aedc30f13afe4f9938798a256aa5ab43aed6" integrity sha512-/xdrTdKk5b4nZYGSzJKlYlVTxap2yaxPcE1bVTDdiDyse/wqIbkd76nIlCaYouVce80/3kTFj0nJaSR2QXjhDA== -"@vendure/core@2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@vendure/core/-/core-2.0.4.tgz#51b81105ef547c7a13397f03df3fdde16c9d76ff" - integrity sha512-EZ2lxJgCRLNBWIZ/XpC+516RaB2O40xt7IOAOg4++77iiuM+US1aX7Wi6Nvpsbrs51mA5ZRs3iFBWEnvyuL5NQ== - dependencies: - "@graphql-tools/stitch" "^8.7.43" - "@nestjs/apollo" "^10.2.0" - "@nestjs/common" "9.3.9" - "@nestjs/core" "9.3.9" - "@nestjs/graphql" "10.2.0" - "@nestjs/platform-express" "9.3.9" - "@nestjs/terminus" "9.2.1" - "@nestjs/testing" "9.3.9" - "@nestjs/typeorm" "9.0.1" - "@types/fs-extra" "^9.0.1" - "@vendure/common" "^2.0.4" - apollo-server-express "3.6.3" - bcrypt "^5.1.0" - body-parser "^1.19.0" - chalk "^4.1.0" - commander "^7.1.0" - cookie-session "^2.0.0-rc.1" - csv-parse "^4.12.0" - express "^4.17.1" - fs-extra "^10.0.0" - graphql "16.6.0" - graphql-fields "^2.0.3" - graphql-scalars "^1.20.1" - graphql-tag "^2.12.6" - graphql-upload "^16.0.2" - http-proxy-middleware "^2.0.1" - i18next "^23.2.6" - i18next-fs-backend "^2.1.5" - i18next-http-middleware "^3.3.2" - i18next-icu "^2.3.0" - image-size "^1.0.0" - intl-messageformat "^10.5.0" - mime-types "^2.1.27" - ms "^2.1.2" - nanoid "^3.1.23" - progress "^2.0.3" - reflect-metadata "^0.1.13" - rxjs "^7.5.4" - typeorm "0.3.11" - "@vendure/core@2.0.6": version "2.0.6" resolved "https://registry.yarnpkg.com/@vendure/core/-/core-2.0.6.tgz#edd507387b38024445a6761ba22bac00c9f643de" @@ -16092,7 +16037,7 @@ ts-node@10.7.0: v8-compile-cache-lib "^3.0.0" yn "3.1.1" -ts-node@^10.8.1, ts-node@^10.9.1: +ts-node@^10.8.1: version "10.9.1" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b" integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==