Skip to content

Commit

Permalink
Upgrade AppBridge to v3.7.5
Browse files Browse the repository at this point in the history
  • Loading branch information
kirillplatonov committed Apr 5, 2023
1 parent 19739be commit 482c39e
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 16 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Unreleased

* Support Unified Admin [#1658](https://github.com/Shopify/shopify_app/pull/1658)
* Set `access_scopes` column to string by default [#1636](https://github.com/Shopify/shopify_app/pull/1636)
* Updated AppBridge to 3.7.5 [#1680](https://github.com/Shopify/shopify_app/pull/1680)

21.4.1 (Feb 21, 2023)
----------
Expand Down
10 changes: 0 additions & 10 deletions app/assets/javascripts/shopify_app/app_bridge_3.1.1.js

This file was deleted.

10 changes: 10 additions & 0 deletions app/assets/javascripts/shopify_app/app_bridge_3.7.5.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions app/assets/javascripts/shopify_app/app_bridge_redirect.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//= require ./app_bridge_3.1.1.js
//= require ./app_bridge_3.7.5.js

(function(window) {
function appBridgeRedirect(url) {
Expand All @@ -19,4 +19,4 @@
}

window.appBridgeRedirect = appBridgeRedirect;
})(window);
})(window);

This file was deleted.

3 changes: 1 addition & 2 deletions app/assets/javascripts/shopify_app/redirect.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//= require ./app_bridge_redirect.js
//= require ./app_bridge_utils_3.1.1.js

(function () {
function redirect() {
Expand All @@ -11,7 +10,7 @@

var targetInfo = JSON.parse(redirectTargetElement.dataset.target);

var appBridgeUtils = window['app-bridge-utils'];
var appBridgeUtils = window['app-bridge']['utilities'];

if (appBridgeUtils.isShopifyEmbedded()) {
window.appBridgeRedirect(targetInfo.url);
Expand Down
4 changes: 3 additions & 1 deletion test/javascripts/shopify_app/app_bridge_redirect_test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
suite('appBridgeRedirect', () => {
const sandbox = sinon.createSandbox();
const url = '/settings';
const originalAppBridge = window['app-bridge'];

setup(() => {
window['app-bridge'] = {
Expand All @@ -26,6 +27,7 @@ suite('appBridgeRedirect', () => {
teardown(() => {
sandbox.restore();
delete window['app-bridge'];
window['app-bridge'] = originalAppBridge;
});


Expand Down Expand Up @@ -62,4 +64,4 @@ suite('appBridgeRedirect', () => {
normalizedUrl
);
});
});
});

0 comments on commit 482c39e

Please sign in to comment.