From 580b3c40f002c223e95e362bf893e14a1a3fe2c3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 11 May 2023 14:32:20 +0000 Subject: [PATCH 1/3] Version Packages --- .changeset/chatty-countries-fold.md | 5 ----- .changeset/clean-paws-invent.md | 5 ----- .changeset/curvy-gorillas-smoke.md | 5 ----- .changeset/five-mails-explain.md | 2 -- .changeset/forty-fireants-judge.md | 5 ----- .changeset/green-terms-judge.md | 14 ------------ .changeset/late-wolves-invent.md | 5 ----- .changeset/long-brooms-poke.md | 5 ----- .changeset/nine-donkeys-tickle.md | 5 ----- .changeset/nine-flies-drop.md | 5 ----- .changeset/plenty-parrots-love.md | 2 -- .changeset/silly-nails-swim.md | 2 -- .changeset/silly-rivers-fold.md | 5 ----- .changeset/sour-paws-tap.md | 5 ----- .changeset/three-rules-sell.md | 5 ----- .changeset/unlucky-falcons-search.md | 5 ----- .changeset/weak-shoes-join.md | 5 ----- CHANGELOG.md | 32 ++++++++++++++++++++++++++++ package.json | 2 +- 19 files changed, 33 insertions(+), 86 deletions(-) delete mode 100644 .changeset/chatty-countries-fold.md delete mode 100644 .changeset/clean-paws-invent.md delete mode 100644 .changeset/curvy-gorillas-smoke.md delete mode 100644 .changeset/five-mails-explain.md delete mode 100644 .changeset/forty-fireants-judge.md delete mode 100644 .changeset/green-terms-judge.md delete mode 100644 .changeset/late-wolves-invent.md delete mode 100644 .changeset/long-brooms-poke.md delete mode 100644 .changeset/nine-donkeys-tickle.md delete mode 100644 .changeset/nine-flies-drop.md delete mode 100644 .changeset/plenty-parrots-love.md delete mode 100644 .changeset/silly-nails-swim.md delete mode 100644 .changeset/silly-rivers-fold.md delete mode 100644 .changeset/sour-paws-tap.md delete mode 100644 .changeset/three-rules-sell.md delete mode 100644 .changeset/unlucky-falcons-search.md delete mode 100644 .changeset/weak-shoes-join.md diff --git a/.changeset/chatty-countries-fold.md b/.changeset/chatty-countries-fold.md deleted file mode 100644 index b911ec579..000000000 --- a/.changeset/chatty-countries-fold.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@shopify/shopify-api': patch ---- - -Removed setCrypto function to simplify runtimes diff --git a/.changeset/clean-paws-invent.md b/.changeset/clean-paws-invent.md deleted file mode 100644 index 8a4425bad..000000000 --- a/.changeset/clean-paws-invent.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@shopify/shopify-api': patch ---- - -Add scopes validation for AuthScopes object and convert it to array. Fixes [#1208](https://github.com/Shopify/shopify-app-template-node/issues/1208), [1221](https://github.com/Shopify/shopify-app-template-node/issues/1221) \ No newline at end of file diff --git a/.changeset/curvy-gorillas-smoke.md b/.changeset/curvy-gorillas-smoke.md deleted file mode 100644 index 521f051ef..000000000 --- a/.changeset/curvy-gorillas-smoke.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@shopify/shopify-api': patch ---- - -Replace `semver` with `compare-versions` lib to reduce dependency on nodejs builtin-libs diff --git a/.changeset/five-mails-explain.md b/.changeset/five-mails-explain.md deleted file mode 100644 index a845151cc..000000000 --- a/.changeset/five-mails-explain.md +++ /dev/null @@ -1,2 +0,0 @@ ---- ---- diff --git a/.changeset/forty-fireants-judge.md b/.changeset/forty-fireants-judge.md deleted file mode 100644 index fe13419a2..000000000 --- a/.changeset/forty-fireants-judge.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@shopify/shopify-api': minor ---- - -Added returnUrl as parameter to billing request function, improved returnUrl logic diff --git a/.changeset/green-terms-judge.md b/.changeset/green-terms-judge.md deleted file mode 100644 index 08158d34c..000000000 --- a/.changeset/green-terms-judge.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -'@shopify/shopify-api': patch ---- - -[Custom store apps only] Add new `adminApiAccessToken` parameter to `config` for when `isCustomStoreApp` is `true`. If set, it will be used for API access. `apiSecretKey` should now be set to the custom store app's API secret key, which is used to validate the HMAC of webhook events received from Shopify for a custom store app. Fixes #772, #800 - -For apps that don't receive HTTP webhook events from Shopify, no change is required yet - `apiSecretKey` will be used for client authentication as the fallback option. - -Starting with the next major release - -- `adminApiAccessToken` will be mandatory for custom store apps and must be set to the Admin API access token -- `apiSecretKey` will not be used for client authentication but must be set for HMAC validation of HTTP webhook events - -See [setting up a custom store app](https://github.com/shopify/shopify-api-js/blob/main/docs/guides/custom-store-app.md) for more details. diff --git a/.changeset/late-wolves-invent.md b/.changeset/late-wolves-invent.md deleted file mode 100644 index 52f7b4035..000000000 --- a/.changeset/late-wolves-invent.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@shopify/shopify-api': patch ---- - -Add deprecation notice for removal of Node 14 support from next major release diff --git a/.changeset/long-brooms-poke.md b/.changeset/long-brooms-poke.md deleted file mode 100644 index f65930417..000000000 --- a/.changeset/long-brooms-poke.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@shopify/shopify-api': minor ---- - -Discount functionality for App Billing. Fixes #731 diff --git a/.changeset/nine-donkeys-tickle.md b/.changeset/nine-donkeys-tickle.md deleted file mode 100644 index c0d2ab418..000000000 --- a/.changeset/nine-donkeys-tickle.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@shopify/shopify-api': patch ---- - -Bumps [jose](https://github.com/panva/jose) from 4.13.1 to 4.14.1. See jose's [changelog](https://github.com/panva/jose/blob/main/CHANGELOG.md) for more details. diff --git a/.changeset/nine-flies-drop.md b/.changeset/nine-flies-drop.md deleted file mode 100644 index 4c75241d3..000000000 --- a/.changeset/nine-flies-drop.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@shopify/shopify-api': patch ---- - -apiKey configuration parameter is not mandatory when isCustomStoreApp is true. Fixes 782 diff --git a/.changeset/plenty-parrots-love.md b/.changeset/plenty-parrots-love.md deleted file mode 100644 index a845151cc..000000000 --- a/.changeset/plenty-parrots-love.md +++ /dev/null @@ -1,2 +0,0 @@ ---- ---- diff --git a/.changeset/silly-nails-swim.md b/.changeset/silly-nails-swim.md deleted file mode 100644 index a845151cc..000000000 --- a/.changeset/silly-nails-swim.md +++ /dev/null @@ -1,2 +0,0 @@ ---- ---- diff --git a/.changeset/silly-rivers-fold.md b/.changeset/silly-rivers-fold.md deleted file mode 100644 index 72fbc0a3f..000000000 --- a/.changeset/silly-rivers-fold.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@shopify/shopify-api': patch ---- - -Extend support for Event topic names diff --git a/.changeset/sour-paws-tap.md b/.changeset/sour-paws-tap.md deleted file mode 100644 index 70ce7f520..000000000 --- a/.changeset/sour-paws-tap.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@shopify/shopify-api': patch ---- - -Restoring REST resources for 2022-04, updates to certain resources for other API versions diff --git a/.changeset/three-rules-sell.md b/.changeset/three-rules-sell.md deleted file mode 100644 index 82fb0cb65..000000000 --- a/.changeset/three-rules-sell.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@shopify/shopify-api': patch ---- - -[Fix] Forward original graphql error message to client diff --git a/.changeset/unlucky-falcons-search.md b/.changeset/unlucky-falcons-search.md deleted file mode 100644 index 02ce382f0..000000000 --- a/.changeset/unlucky-falcons-search.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@shopify/shopify-api': patch ---- - -Adds check for Google's Crawler in the authorization functions to prevent CookieNotFound error loops. Fixes #686 diff --git a/.changeset/weak-shoes-join.md b/.changeset/weak-shoes-join.md deleted file mode 100644 index e2a8e6c27..000000000 --- a/.changeset/weak-shoes-join.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@shopify/shopify-api': patch ---- - -Add trial days and replacement behavior to usage billing mutation. Fixes #770 diff --git a/CHANGELOG.md b/CHANGELOG.md index 27ce9bdb7..eb7d02892 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,37 @@ # Changelog +## 7.1.0 + +### Minor Changes + +- 1a64d96c: Added returnUrl as parameter to billing request function, improved returnUrl logic +- 89cca000: Discount functionality for App Billing. Fixes #731 + +### Patch Changes + +- 8de3c783: Removed setCrypto function to simplify runtimes +- 2628a7fc: Add scopes validation for AuthScopes object and convert it to array. Fixes [#1208](https://github.com/Shopify/shopify-app-template-node/issues/1208), [1221](https://github.com/Shopify/shopify-app-template-node/issues/1221) +- d028ec0f: Replace `semver` with `compare-versions` lib to reduce dependency on nodejs builtin-libs +- 7dcecb65: [Custom store apps only] Add new `adminApiAccessToken` parameter to `config` for when `isCustomStoreApp` is `true`. If set, it will be used for API access. `apiSecretKey` should now be set to the custom store app's API secret key, which is used to validate the HMAC of webhook events received from Shopify for a custom store app. Fixes #772, #800 + + For apps that don't receive HTTP webhook events from Shopify, no change is required yet - `apiSecretKey` will be used for client authentication as the fallback option. + + Starting with the next major release + + - `adminApiAccessToken` will be mandatory for custom store apps and must be set to the Admin API access token + - `apiSecretKey` will not be used for client authentication but must be set for HMAC validation of HTTP webhook events + + See [setting up a custom store app](https://github.com/shopify/shopify-api-js/blob/main/docs/guides/custom-store-app.md) for more details. + +- 450c9e7f: Add deprecation notice for removal of Node 14 support from next major release +- 9c095d12: Bumps [jose](https://github.com/panva/jose) from 4.13.1 to 4.14.1. See jose's [changelog](https://github.com/panva/jose/blob/main/CHANGELOG.md) for more details. +- f04f0f64: apiKey configuration parameter is not mandatory when isCustomStoreApp is true. Fixes 782 +- 464fd4f2: Extend support for Event topic names +- e8966d50: Restoring REST resources for 2022-04, updates to certain resources for other API versions +- 8de6024f: [Fix] Forward original graphql error message to client +- f09417c4: Adds check for Google's Crawler in the authorization functions to prevent CookieNotFound error loops. Fixes #686 +- cbffa2f6: Add trial days and replacement behavior to usage billing mutation. Fixes #770 + ## 7.0.0 ### Major Changes diff --git a/package.json b/package.json index e54f4a39f..371db97be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@shopify/shopify-api", - "version": "7.0.0", + "version": "7.1.0", "description": "Shopify API Library for Node - accelerate development with support for authentication, graphql proxy, webhooks", "main": "./lib/index.js", "types": "./lib/index.d.ts", From 8db7c8ffd2536fb46b19d4b3bc0b42b68a00b87f Mon Sep 17 00:00:00 2001 From: Kevin O'Sullivan Date: Thu, 11 May 2023 11:22:39 -0400 Subject: [PATCH 2/3] Update version, changelog --- CHANGELOG.md | 8 ++++---- lib/version.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb7d02892..c642e568f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,12 @@ ### Minor Changes -- 1a64d96c: Added returnUrl as parameter to billing request function, improved returnUrl logic +- 1a64d96c: Added `returnUrl` as optional parameter to billing `request` function, improved `returnUrl` logic. See [documentation](https://github.com/Shopify/shopify-api-js/blob/main/docs/reference/billing/request.md#returnurl) of `returnUrl` parameter for more details. - 89cca000: Discount functionality for App Billing. Fixes #731 ### Patch Changes -- 8de3c783: Removed setCrypto function to simplify runtimes +- 8de3c783: Removed `setCrypto` function to simplify runtimes - 2628a7fc: Add scopes validation for AuthScopes object and convert it to array. Fixes [#1208](https://github.com/Shopify/shopify-app-template-node/issues/1208), [1221](https://github.com/Shopify/shopify-app-template-node/issues/1221) - d028ec0f: Replace `semver` with `compare-versions` lib to reduce dependency on nodejs builtin-libs - 7dcecb65: [Custom store apps only] Add new `adminApiAccessToken` parameter to `config` for when `isCustomStoreApp` is `true`. If set, it will be used for API access. `apiSecretKey` should now be set to the custom store app's API secret key, which is used to validate the HMAC of webhook events received from Shopify for a custom store app. Fixes #772, #800 @@ -25,11 +25,11 @@ - 450c9e7f: Add deprecation notice for removal of Node 14 support from next major release - 9c095d12: Bumps [jose](https://github.com/panva/jose) from 4.13.1 to 4.14.1. See jose's [changelog](https://github.com/panva/jose/blob/main/CHANGELOG.md) for more details. -- f04f0f64: apiKey configuration parameter is not mandatory when isCustomStoreApp is true. Fixes 782 +- f04f0f64: `apiKey` configuration parameter is no longer mandatory when `isCustomStoreApp` is `true`. Fixes 782 - 464fd4f2: Extend support for Event topic names - e8966d50: Restoring REST resources for 2022-04, updates to certain resources for other API versions - 8de6024f: [Fix] Forward original graphql error message to client -- f09417c4: Adds check for Google's Crawler in the authorization functions to prevent CookieNotFound error loops. Fixes #686 +- f09417c4: Adds check for Google's Crawler in the authorization functions to prevent `CookieNotFound` error loops. Fixes #686 - cbffa2f6: Add trial days and replacement behavior to usage billing mutation. Fixes #770 ## 7.0.0 diff --git a/lib/version.ts b/lib/version.ts index a9c50d92f..ff5fe6114 100644 --- a/lib/version.ts +++ b/lib/version.ts @@ -1 +1 @@ -export const SHOPIFY_API_LIBRARY_VERSION = '7.0.0'; +export const SHOPIFY_API_LIBRARY_VERSION = '7.1.0'; From 69b5428a7d8ef590d0798bc495e38dfffb23eb80 Mon Sep 17 00:00:00 2001 From: Kevin O'Sullivan Date: Thu, 11 May 2023 11:30:49 -0400 Subject: [PATCH 3/3] Fix links in changelog --- CHANGELOG.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c642e568f..b16e0d190 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,14 +5,14 @@ ### Minor Changes - 1a64d96c: Added `returnUrl` as optional parameter to billing `request` function, improved `returnUrl` logic. See [documentation](https://github.com/Shopify/shopify-api-js/blob/main/docs/reference/billing/request.md#returnurl) of `returnUrl` parameter for more details. -- 89cca000: Discount functionality for App Billing. Fixes #731 +- 89cca000: Discount functionality for App Billing. Fixes [#731](https://github.com/Shopify/shopify-api-js/issues/731) ### Patch Changes - 8de3c783: Removed `setCrypto` function to simplify runtimes - 2628a7fc: Add scopes validation for AuthScopes object and convert it to array. Fixes [#1208](https://github.com/Shopify/shopify-app-template-node/issues/1208), [1221](https://github.com/Shopify/shopify-app-template-node/issues/1221) - d028ec0f: Replace `semver` with `compare-versions` lib to reduce dependency on nodejs builtin-libs -- 7dcecb65: [Custom store apps only] Add new `adminApiAccessToken` parameter to `config` for when `isCustomStoreApp` is `true`. If set, it will be used for API access. `apiSecretKey` should now be set to the custom store app's API secret key, which is used to validate the HMAC of webhook events received from Shopify for a custom store app. Fixes #772, #800 +- 7dcecb65: [Custom store apps only] Add new `adminApiAccessToken` parameter to `config` for when `isCustomStoreApp` is `true`. If set, it will be used for API access. `apiSecretKey` should now be set to the custom store app's API secret key, which is used to validate the HMAC of webhook events received from Shopify for a custom store app. Fixes [#772](https://github.com/Shopify/shopify-api-js/issues/772), [#800](https://github.com/Shopify/shopify-api-js/issues/800) For apps that don't receive HTTP webhook events from Shopify, no change is required yet - `apiSecretKey` will be used for client authentication as the fallback option. @@ -25,12 +25,12 @@ - 450c9e7f: Add deprecation notice for removal of Node 14 support from next major release - 9c095d12: Bumps [jose](https://github.com/panva/jose) from 4.13.1 to 4.14.1. See jose's [changelog](https://github.com/panva/jose/blob/main/CHANGELOG.md) for more details. -- f04f0f64: `apiKey` configuration parameter is no longer mandatory when `isCustomStoreApp` is `true`. Fixes 782 +- f04f0f64: `apiKey` configuration parameter is no longer mandatory when `isCustomStoreApp` is `true`. Fixes [#782](https://github.com/Shopify/shopify-api-js/issues/782) - 464fd4f2: Extend support for Event topic names - e8966d50: Restoring REST resources for 2022-04, updates to certain resources for other API versions - 8de6024f: [Fix] Forward original graphql error message to client -- f09417c4: Adds check for Google's Crawler in the authorization functions to prevent `CookieNotFound` error loops. Fixes #686 -- cbffa2f6: Add trial days and replacement behavior to usage billing mutation. Fixes #770 +- f09417c4: Adds check for Google's Crawler in the authorization functions to prevent `CookieNotFound` error loops. Fixes [#686](https://github.com/Shopify/shopify-api-js/issues/686) +- cbffa2f6: Add trial days and replacement behavior to usage billing mutation. Fixes [#770](https://github.com/Shopify/shopify-api-js/issues/770) ## 7.0.0