Skip to content

Commit 35e89c7

Browse files
authored
Merge pull request #1949 from Shopify/add-support-for-trusted-shop-dev
Add support for trusted Shopify domain .shop.dev
2 parents ef63ee3 + 3b3590e commit 35e89c7

File tree

5 files changed

+10
-2
lines changed

5 files changed

+10
-2
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Unreleased
22
----------
33

4+
22.5.2 (March 14, 2025)
5+
----------
6+
- Add support for a new trusted Shopify domain [#1949](https://github.com/Shopify/shopify_app/pull/1949)
7+
48
22.5.1 (December 11, 2024)
59
----------
610
- Fix Rails [CVE-2024-54133](https://github.com/rails/rails/commit/3da2479cfe1e00177114b17e496213c40d286b3a) [1929](https://github.com/Shopify/shopify_app/pull/1929)

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
shopify_app (22.5.1)
4+
shopify_app (22.5.2)
55
activeresource
66
addressable (~> 2.7)
77
jwt (>= 2.2.3)

lib/shopify_app/utils.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ class << self
88
"myshopify.io",
99
"myshopify.com",
1010
"spin.dev",
11+
"shop.dev",
1112
].freeze
1213

1314
def sanitize_shop_domain(shop_domain)

lib/shopify_app/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module ShopifyApp
4-
VERSION = "22.5.1"
4+
VERSION = "22.5.2"
55
end

test/shopify_app/utils_test.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ class UtilsTest < ActiveSupport::TestCase
1212
"my-shop.myshopify.com",
1313
"https://my-shop.myshopify.com",
1414
"http://my-shop.myshopify.com",
15+
"my-shop.shop.dev",
16+
"https://my-shop.shop.dev",
17+
"http://my-shop.shop.dev",
1518
].each do |good_url|
1619
test "sanitize_shop_domain for (#{good_url})" do
1720
assert ShopifyApp::Utils.sanitize_shop_domain(good_url)

0 commit comments

Comments
 (0)