shopify-cli 2.15.3 → 2.15.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f795330308fe8098043f9757452c62c5366eebcd724a90b3e81aafceb82a4f0
-  data.tar.gz: b5bac3e2def77bb94b993d39230a489d646bee5848cf4500e523da2b413e517f
+  metadata.gz: 756d40b258dafcaa9e3fd02305cbc3eb4bc1416b5711f22543c9b6221c4bd888
+  data.tar.gz: 476eea5325f671f2e3a1337700356f895792c1e4b2568dc56e38c58b4d1e93d5
 SHA512:
-  metadata.gz: 05ffb12d03f75fd4bd1f5f8e0709445b51364cd8d8576407473c2f7ccc8ae1fa6d202181005041dd258ede96a1cd4a2382d9572cc427f936d62a9071229ce997
-  data.tar.gz: 2afbac5fe6fc03aa52858b00118661faac907cb23bb9c37368e46e4eb79feb3a309482d7ac59828b964c7a43d6de3c2446e750b6412344729e115f422b42bb84
+  metadata.gz: 11bee20d53a3809978a2cf37a7f4ed3e759f0edd7d53ac8ec9e08dad76c1bd3ed8fcbf66262dc686d7bf929fec256685189facaf1255c2f51c2f566757b7ae29
+  data.tar.gz: 8cb0d2cb3d2edf801f752b74ed8534816180e257d3a1afef8fb0b13ffa5a3a85388bd6bb71df04d0c42bf450cedd1008e473f36cf48722435eea912645dcb1e9

data/CHANGELOG.md

@@ -2,6 +2,23 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.15.6 - 2022-04-12
+
+### Fixed
+* [#2246](https://github.com/Shopify/shopify-cli/pull/2246): Fix callback urls for app serve
+
+## Version 2.15.5 - 2022-04-08
+
+### Fixed
+* [#2237](https://github.com/Shopify/shopify-cli/pull/2237): Fix Homebrew Wrapper
+
+## Version 2.15.4 - 2022-04-08
+
+### Fixed
+* [#2230](https://github.com/Shopify/shopify-cli/pull/2230): Show an error without ngrok account
+* [#2235](https://github.com/Shopify/shopify-cli/pull/2235): Update shopify-extensions to v0.3.0 and fix issues with template choosing and missing dependencies
+* [#2226](https://github.com/Shopify/shopify-cli/pull/2226): Fix liquid file size validation to disclude locales directory
+
 ## Version 2.15.3 - 2022-04-07
 
 ### Changed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.15.3)
+    shopify-cli (2.15.6)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.10.1)

data/ext/shopify-extensions/version

@@ -1 +1 @@
-v0.2.0
+v0.3.0

data/lib/project_types/extension/cli.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "pathname"
+require "json"
+require "yaml"
+
 module Extension
   class PackageResolutionFailed < RuntimeError; end
 

data/lib/project_types/extension/forms/questions/ask_template.rb

@@ -21,8 +21,7 @@ module Extension
 
         def template_required?(project_details)
           type = project_details&.type&.identifier
-          (Models::DevelopmentServerRequirements.beta_enabled? &&
-            Models::DevelopmentServerRequirements.type_supported?(type.downcase))
+          Models::DevelopmentServerRequirements.supported?(type)
         end
 
         def choose_interactively

data/lib/project_types/extension/models/specification_handlers/theme_app_extension.rb

@@ -38,7 +38,10 @@ module Extension
                   # Other assets should be treated as UTF-8 encoded text
                   mode = "rt"
                   encoding = "UTF-8"
-                  current_liquid_size += File.size(filename)
+
+                  if dirname == "snippets" || dirname == "blocks"
+                    current_liquid_size += File.size(filename)
+                  end
                 end
                 current_size += File.size(filename)
                 if current_size > BUNDLE_SIZE_LIMIT

data/lib/shopify_cli/messages/messages.rb

@@ -760,16 +760,12 @@ module ShopifyCLI
               " package manager for your system.",
             ngrok: "Something went wrong with ngrok installation,"\
               "please make sure %s exists within %s before trying again",
+            signup_required: "A free ngrok account is required: {{underline:https://ngrok.com/signup}}. After you "\
+              "signup, install your personal authorization token using {{command:%s app tunnel auth <token>}}.",
           },
           installing: "Installing ngrok…",
           not_running: "{{green:x}} ngrok tunnel not running",
           prereq_command_location: "%s @ %s",
-          signup_suggestion: <<~MESSAGE,
-            {{*}} To avoid tunnels that timeout, it is recommended to signup for a free ngrok
-            account at {{underline:https://ngrok.com/signup}}. After you signup, install your
-            personalized authorization token using {{command:%s app tunnel auth <token>}}.
-          MESSAGE
-          start: "{{v}} ngrok tunnel running at {{underline:%s}}",
           start_with_account: "{{v}} ngrok tunnel running at {{underline:%s}}, with account %s",
           stopped: "{{green:x}} ngrok tunnel stopped",
           timed_out: "{{x}} ngrok tunnel has timed out, restarting…",

data/lib/shopify_cli/services/app/serve/serve_service.rb

@@ -36,7 +36,7 @@ module ShopifyCLI
             ShopifyCLI::Tasks::UpdateDashboardURLS.call(
               context,
               url: project.env.host,
-              callback_url: "/auth/shopify/callback",
+              callback_urls: %w(/auth/shopify/callback /auth/callback),
             )
           end
 

data/lib/shopify_cli/tasks/update_dashboard_urls.rb

@@ -1,18 +1,21 @@
+require "set"
+
 module ShopifyCLI
   module Tasks
     class UpdateDashboardURLS < ShopifyCLI::Task
       NGROK_REGEX = /https:\/\/([a-z0-9\-]+\.ngrok\.io)(.*)/
 
-      def call(ctx, url:, callback_url:)
+      def call(ctx, url:, callback_urls:)
         @ctx = ctx
         project = ShopifyCLI::Project.current
         api_key = project.env.api_key
         result = ShopifyCLI::PartnersAPI.query(ctx, "get_app_urls", apiKey: api_key)
         app = result["data"]["app"]
 
-        return if app["applicationUrl"].match(url)
+        constructed_urls = construct_redirect_urls(app["redirectUrlWhitelist"], url, callback_urls)
+
+        return if already_updated(app, constructed_urls, url)
 
-        constructed_urls = construct_redirect_urls(app["redirectUrlWhitelist"], url, callback_url)
         ShopifyCLI::PartnersAPI.query(@ctx, "update_dashboard_urls", input: {
           applicationUrl: url,
           redirectUrlWhitelist: constructed_urls,
@@ -25,7 +28,7 @@ module ShopifyCLI
         raise
       end
 
-      def construct_redirect_urls(urls, new_url, callback_url)
+      def construct_redirect_urls(urls, new_url, callback_urls)
         new_urls = urls.map do |url|
           if (match = url.match(NGROK_REGEX))
             "#{new_url}#{match[2]}"
@@ -33,11 +36,22 @@ module ShopifyCLI
             url
           end
         end
-        if new_urls.grep(/#{new_url}#{callback_url}/).empty?
-          new_urls.push("#{new_url}#{callback_url}")
+        callback_urls.each do |callback_url|
+          if new_urls.grep(/#{new_url}#{callback_url}/).empty?
+            new_urls.push("#{new_url}#{callback_url}")
+          end
         end
         new_urls.uniq
       end
+
+      private
+
+      def already_updated(app, new_redirect_urls, new_url)
+        current_url = app["applicationUrl"]
+        current_redirect_urls = app["redirectUrlWhitelist"]
+        current_url.match(new_url) &&
+          Set.new(current_redirect_urls) == Set.new(new_redirect_urls)
+      end
     end
   end
 end

data/lib/shopify_cli/theme/dev_server/local_assets.rb

@@ -44,7 +44,7 @@ module ShopifyCLI
 
         def serve_file(path_info)
           path = @theme.root.join(path_info[1..-1])
-          if path.file? && path.readable?
+          if path.file? && path.readable? && @theme.theme_file?(path)
             [
               200,
               {

data/lib/shopify_cli/tunnel.rb

@@ -66,14 +66,9 @@ module ShopifyCLI
     #
     def start(ctx, port: PORT)
       install(ctx)
-      if authenticated?
-        url, account = start_ngrok(ctx, port)
-        ctx.puts(ctx.message("core.tunnel.start_with_account", url, account))
-      else
-        url, _ = restart_ngrok(ctx, port)
-        ctx.puts(ctx.message("core.tunnel.start", url))
-        ctx.puts(ctx.message("core.tunnel.signup_suggestion", ShopifyCLI::TOOL_NAME))
-      end
+      ctx.abort(ctx.message("core.tunnel.error.signup_required", ShopifyCLI::TOOL_NAME)) unless authenticated?
+      url, account = start_ngrok(ctx, port)
+      ctx.puts(ctx.message("core.tunnel.start_with_account", url, account))
       url
     end
 
@@ -208,11 +203,6 @@ module ShopifyCLI
       [log.url, log.account]
     end
 
-    def restart_ngrok(ctx, port)
-      ShopifyCLI::ProcessSupervision.stop(:ngrok)
-      start_ngrok(ctx, port)
-    end
-
     def check_prereq_command(ctx, command)
       cmd_path = ctx.which(command)
       ctx.abort(ctx.message("core.tunnel.error.prereq_command_required", command)) if cmd_path.nil?

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.15.3"
+  VERSION = "2.15.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.15.3
+  version: 2.15.6
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-07 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler