shopify-cli 2.15.2 → 2.15.3

data/lib/shopify_cli/services/app/create/rails_service.rb

@@ -109,7 +109,9 @@ module ShopifyCLI
 
           def check_ruby
             ruby_version = Environment.ruby_version(context: context)
-            return if ruby_version.satisfies?("~>2.5") || ruby_version.satisfies?("~>3.1.0")
+            return if ruby_version.satisfies?("~>2.5") ||
+              ruby_version.satisfies?("~>3.0.0") ||
+              ruby_version.satisfies?("~>3.1.0")
             context.abort(context.message("core.app.create.rails.error.invalid_ruby_version"))
           end
 
@@ -205,6 +207,12 @@ module ShopifyCLI
           end
 
           def set_custom_ua
+            requires_ua_file = Dir.chdir(context.root) do
+              context.ruby_gem_version("shopify_app") < ::Semantic::Version.new("19.0.0")
+            end
+
+            return unless requires_ua_file
+
             ua_path = File.join("config", "initializers", "user_agent.rb")
             context.write(ua_path, USER_AGENT_CODE)
           end

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

@@ -2,32 +2,9 @@ module ShopifyCLI
   module Services
     module App
       module Serve
-        class NodeService < BaseService
-          attr_accessor :host, :port, :context
-
-          def initialize(host:, port:, context:)
-            @host = host
-            @port = port
-            @context = context
-            super()
-          end
-
+        class NodeService < ServeService
           def call
-            project = ShopifyCLI::Project.current
-            url = host || ShopifyCLI::Tunnel.start(context, port: port)
-            raise ShopifyCLI::Abort,
-              context.message("core.app.serve.error.host_must_be_https") if url.match(/^https/i).nil?
-            project.env.update(context, :host, url)
-            ShopifyCLI::Tasks::UpdateDashboardURLS.call(
-              context,
-              url: url,
-              callback_url: "/auth/callback",
-            )
-
-            if project.env.shop
-              project_url = "#{project.env.host}/auth?shop=#{project.env.shop}"
-              context.puts("\n" + context.message("core.app.serve.open_info", project_url) + "\n")
-            end
+            generate_url
 
             CLI::UI::Frame.open(context.message("core.app.serve.running_server")) do
               env = project.env.to_h

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

@@ -2,32 +2,9 @@ module ShopifyCLI
   module Services
     module App
       module Serve
-        class PHPService < BaseService
-          attr_accessor :host, :port, :context
-
-          def initialize(host:, port:, context:)
-            @host = host
-            @port = port
-            @context = context
-            super()
-          end
-
+        class PHPService < ServeService
           def call
-            project = ShopifyCLI::Project.current
-            url = host || ShopifyCLI::Tunnel.start(context, port: port)
-            raise ShopifyCLI::Abort,
-              context.message("core.app.serve.error.host_must_be_https") if url.match(/^https/i).nil?
-            project.env.update(context, :host, url)
-            ShopifyCLI::Tasks::UpdateDashboardURLS.call(
-              context,
-              url: url,
-              callback_url: "/auth/callback",
-            )
-
-            if project.env.shop
-              project_url = "#{project.env.host}/login?shop=#{project.env.shop}"
-              context.puts("\n" + context.message("core.app.serve.open_info", project_url) + "\n")
-            end
+            generate_url
 
             CLI::UI::Frame.open(context.message("core.app.serve.running_server")) do
               if ShopifyCLI::ProcessSupervision.running?(:npm_watch)

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

@@ -2,38 +2,18 @@ module ShopifyCLI
   module Services
     module App
       module Serve
-        class RailsService < BaseService
-          attr_accessor :host, :port, :context
-
-          def initialize(host:, port:, context:)
-            @host = host
-            @port = port
-            @context = context
-            super()
-          end
-
+        class RailsService < ServeService
           def call
-            project = ShopifyCLI::Project.current
-            url = host || ShopifyCLI::Tunnel.start(context, port: port)
-            raise ShopifyCLI::Abort,
-              context.message("core.app.serve.error.host_must_be_https") if url.match(/^https/i).nil?
-            project.env.update(context, :host, url)
-            ShopifyCLI::Tasks::UpdateDashboardURLS.call(
-              context,
-              url: url,
-              callback_url: "/auth/shopify/callback",
-            )
-
-            if project.env.shop
-              project_url = "#{project.env.host}/login?shop=#{project.env.shop}"
-              context.puts("\n" + context.message("core.app.serve.open_info", project_url) + "\n")
-            end
+            generate_url
 
             CLI::UI::Frame.open(context.message("core.app.serve.running_server")) do
-              env = ShopifyCLI::Project.current.env.to_h
-              env.delete("HOST")
+              original_env = JSON.parse(ENV["ORIGINAL_ENV"] || "{}")
+              env = original_env.merge(ShopifyCLI::Project.current.env.to_h)
+              env.delete("HOST") if context.ruby_gem_version("shopify_app") < ::Semantic::Version.new("19.0.0")
               env["PORT"] = port.to_s
-              env["GEM_PATH"] = Rails::Gem.gem_path(context)
+              env["GEM_PATH"] =
+                [env["GEM_PATH"], Rails::Gem.gem_path(context)].compact
+                  .join(CLI::UI::OS.current.path_separator)
               if context.windows?
                 context.system("ruby bin\\rails server", env: env)
               else

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

@@ -0,0 +1,57 @@
+module ShopifyCLI
+  module Services
+    module App
+      module Serve
+        class ServeService < BaseService
+          attr_accessor :host, :port, :no_update, :context
+
+          def initialize(host:, port:, no_update:, context:)
+            @host = host
+            @port = port
+            @no_update = no_update
+            @context = context
+            super()
+          end
+
+          def call
+            raise NotImplementedError
+          end
+
+          private
+
+          def generate_url
+            create_tunnel
+            update_url unless no_update
+            show_app_url
+          end
+
+          def create_tunnel
+            url = host || ShopifyCLI::Tunnel.start(context, port: port)
+            raise ShopifyCLI::Abort,
+              context.message("core.app.serve.error.host_must_be_https") if url.match(/^https/i).nil?
+            project.env.update(context, :host, url)
+          end
+
+          def update_url
+            ShopifyCLI::Tasks::UpdateDashboardURLS.call(
+              context,
+              url: project.env.host,
+              callback_url: "/auth/shopify/callback",
+            )
+          end
+
+          def show_app_url
+            return unless project.env.shop
+
+            project_url = "#{project.env.host}/login?shop=#{project.env.shop}"
+            context.puts("\n" + context.message("core.app.serve.open_info", project_url) + "\n")
+          end
+
+          def project
+            @project ||= ShopifyCLI::Project.current
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/services.rb

@@ -5,6 +5,7 @@ module ShopifyCLI
 
     module App
       module Serve
+        autoload :ServeService, "shopify_cli/services/app/serve/serve_service"
         autoload :NodeService, "shopify_cli/services/app/serve/node_service"
         autoload :RailsService, "shopify_cli/services/app/serve/rails_service"
         autoload :PHPService, "shopify_cli/services/app/serve/php_service"

data/lib/shopify_cli/tasks/update_dashboard_urls.rb

@@ -9,24 +9,22 @@ module ShopifyCLI
         api_key = project.env.api_key
         result = ShopifyCLI::PartnersAPI.query(ctx, "get_app_urls", apiKey: api_key)
         app = result["data"]["app"]
-        consent = check_application_url(app["applicationUrl"], url)
+
+        return if app["applicationUrl"].match(url)
+
         constructed_urls = construct_redirect_urls(app["redirectUrlWhitelist"], url, callback_url)
-        return if url == app["applicationUrl"]
         ShopifyCLI::PartnersAPI.query(@ctx, "update_dashboard_urls", input: {
-          applicationUrl: consent ? url : app["applicationUrl"],
-          redirectUrlWhitelist: constructed_urls, apiKey: api_key
+          applicationUrl: url,
+          redirectUrlWhitelist: constructed_urls,
+          apiKey: api_key,
         })
+
         @ctx.puts(@ctx.message("core.tasks.update_dashboard_urls.updated"))
       rescue
         @ctx.puts(@ctx.message("core.tasks.update_dashboard_urls.update_error", ShopifyCLI::TOOL_NAME))
         raise
       end
 
-      def check_application_url(application_url, new_url)
-        return false if application_url.match(new_url)
-        CLI::UI::Prompt.confirm(@ctx.message("core.tasks.update_dashboard_urls.update_prompt"))
-      end
-
       def construct_redirect_urls(urls, new_url, callback_url)
         new_urls = urls.map do |url|
           if (match = url.match(NGROK_REGEX))

data/lib/shopify_cli/theme/dev_server/remote_watcher/json_files_update_job.rb

@@ -26,6 +26,7 @@ module ShopifyCLI
               .json_files
               .reject { |file| @syncer.pending_updates.include?(file) }
               .reject { |file| @syncer.broken_file?(file) }
+              .reject { |file| @syncer.ignore_file?(file) }
           end
         end
       end

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

@@ -46,20 +46,14 @@ module ShopifyCLI
           files
             .select { |file| @theme.theme_file?(file) }
             .map { |file| @theme[file] }
-            .reject { |file| ignore_file?(file) }
+            .reject { |file| @syncer.ignore_file?(file) }
         end
 
         def filter_remote_files(files)
           files
             .select { |file| @syncer.remote_file?(file) }
             .map { |file| @theme[file] }
-            .reject { |file| ignore_file?(file) }
-        end
-
-        private
-
-        def ignore_file?(file)
-          @ignore_filter&.ignore?(file.relative_path)
+            .reject { |file| @syncer.ignore_file?(file) }
         end
       end
     end

data/lib/shopify_cli/theme/dev_server.rb

@@ -32,7 +32,7 @@ module ShopifyCLI
           theme = DevelopmentTheme.find_or_create!(ctx, root: root)
           ignore_filter = IgnoreFilter.from_path(root)
           @syncer = Syncer.new(ctx, theme: theme, ignore_filter: ignore_filter, overwrite_json: !editor_sync)
-          watcher = Watcher.new(ctx, theme: theme, syncer: @syncer, ignore_filter: ignore_filter, poll: poll)
+          watcher = Watcher.new(ctx, theme: theme, syncer: @syncer, poll: poll)
           remote_watcher = RemoteWatcher.to(theme: theme, syncer: @syncer)
 
           # Setup the middleware stack. Mimics Rack::Builder / config.ru, but in reverse order
@@ -92,7 +92,8 @@ module ShopifyCLI
 
         rescue ShopifyCLI::API::APIRequestForbiddenError,
                ShopifyCLI::API::APIRequestUnauthorizedError
-          raise ShopifyCLI::Abort, @ctx.message("theme.serve.ensure_user", theme.shop)
+          shop = ShopifyCLI::AdminAPI.get_shop_or_abort(@ctx)
+          raise ShopifyCLI::Abort, @ctx.message("theme.serve.ensure_user", shop)
         rescue Errno::EADDRINUSE
           error_message = @ctx.message("theme.serve.address_already_in_use", address)
           help_message = @ctx.message("theme.serve.try_port_option")

data/lib/shopify_cli/theme/theme.rb

@@ -37,10 +37,10 @@ module ShopifyCLI
       end
 
       def glob(pattern, raise_on_dir: false)
-        root.glob(pattern).map do |path|
-          abort_if_directory!(path) if raise_on_dir
-          File.new(path, root)
-        end
+        root
+          .glob(pattern)
+          .select { |path| file?(path, raise_on_dir) }
+          .map { |path| File.new(path, root) }
       end
 
       def theme_file?(file)
@@ -155,6 +155,13 @@ module ShopifyCLI
       end
 
       class << self
+        def create_unpublished(ctx, root: nil, name: nil)
+          name ||= random_name
+          theme = new(ctx, root: root, name: name, role: "unpublished")
+          theme.create
+          theme
+        end
+
         def all(ctx, root: nil)
           _status, body = fetch_themes(ctx)
 
@@ -182,6 +189,10 @@ module ShopifyCLI
 
         private
 
+        def random_name
+          ShopifyCLI::Helpers::Haikunator.haikunate(9999)
+        end
+
         def find(ctx, root, &block)
           _status, body = fetch_themes(ctx)
 
@@ -222,9 +233,12 @@ module ShopifyCLI
         self
       end
 
-      def abort_if_directory!(path)
-        return unless ::File.directory?(path)
-        @ctx.abort(@ctx.message("theme.serve.error.invalid_subdirectory", path.to_s))
+      def file?(path, raise_on_dir = false)
+        if raise_on_dir && ::File.directory?(path)
+          @ctx.abort(@ctx.message("theme.serve.error.invalid_subdirectory", path.to_s))
+        end
+
+        ::File.file?(path)
       end
     end
   end

data/lib/shopify_cli/theme/theme_admin_api.rb

@@ -41,31 +41,46 @@ module ShopifyCLI
         )
       rescue ShopifyCLI::API::APIRequestForbiddenError,
              ShopifyCLI::API::APIRequestUnauthorizedError => error
+
+        ##
         # The Admin API returns 403 Forbidden responses on different
         # scenarios:
         #
         # * when a user doesn't have permissions for a request:
-        #   <APIRequestForbiddenError: 403 {}>
+        #   - <APIRequestForbiddenError: 403 {}>
+        #   - <APIRequestForbiddenError: 403 {"errors":"Unauthorized Access"}>
         #
         # * when an asset operation cannot be performed:
-        #   <APIRequestForbiddenError: 403 {"message":"templates/gift_card.liquid could not be deleted"}>
-        if empty_response_error?(error)
-          return handle_permissions_error
+        #   - <APIRequestForbiddenError: 403 {"message":"templates/gift_card.liquid could not be deleted"}>
+        #
+        if empty_response?(error) || unauthorized_response?(error)
+          return permission_error
         end
 
         raise error
       end
 
-      def handle_permissions_error
+      def permission_error
         ensure_user_error = @ctx.message("theme.ensure_user_error", shop)
         ensure_user_try_this = @ctx.message("theme.ensure_user_try_this")
 
         @ctx.abort(ensure_user_error, ensure_user_try_this)
       end
 
-      def empty_response_error?(error)
-        error_message = error&.response&.body.to_s
-        error_message.empty?
+      def empty_response?(error)
+        response_body(error).empty?
+      end
+
+      def unauthorized_response?(error)
+        parsed_body = JSON.parse(response_body(error))
+        errors = parsed_body["errors"].to_s
+        errors.match?(/Unauthorized Access/)
+      rescue JSON::ParserError
+        false
+      end
+
+      def response_body(error)
+        error&.response&.body.to_s
       end
     end
   end

data/lib/shopify_cli/version.rb

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

data/vendor/deps/cli-ui/lib/cli/ui/os.rb

@@ -35,6 +35,10 @@ module CLI
           def shift_cursor_on_line_reset?
             false
           end
+
+          def path_separator
+            ":"
+          end
         end
       end
 
@@ -58,6 +62,10 @@ module CLI
           def shift_cursor_on_line_reset?
             true
           end
+
+          def path_separator
+            ";"
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.15.2
+  version: 2.15.3
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-28 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,15 +158,19 @@ files:
 - ext/javy/hashes/javy-arm-macos-v0.1.0.gz.sha256
 - ext/javy/hashes/javy-arm-macos-v0.2.0.gz.sha256
 - ext/javy/hashes/javy-arm-macos-v0.2.1.gz.sha256
+- ext/javy/hashes/javy-arm-macos-v0.3.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-linux-v0.1.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-linux-v0.2.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-linux-v0.2.1.gz.sha256
+- ext/javy/hashes/javy-x86_64-linux-v0.3.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-macos-v0.1.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-macos-v0.2.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-macos-v0.2.1.gz.sha256
+- ext/javy/hashes/javy-x86_64-macos-v0.3.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-windows-v0.1.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-windows-v0.2.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-windows-v0.2.1.gz.sha256
+- ext/javy/hashes/javy-x86_64-windows-v0.3.0.gz.sha256
 - ext/javy/javy.rb
 - ext/javy/version
 - ext/shopify-extensions/extconf.rb
@@ -247,6 +251,9 @@ files:
 - lib/project_types/extension/models/server_config/root.rb
 - lib/project_types/extension/models/server_config/user.rb
 - lib/project_types/extension/models/specification.rb
+- lib/project_types/extension/models/specification_handlers/beacon_extension.rb
+- lib/project_types/extension/models/specification_handlers/beacon_extension_utils/script_config.rb
+- lib/project_types/extension/models/specification_handlers/beacon_extension_utils/script_config_repository.rb
 - lib/project_types/extension/models/specification_handlers/checkout_post_purchase.rb
 - lib/project_types/extension/models/specification_handlers/checkout_ui_extension.rb
 - lib/project_types/extension/models/specification_handlers/default.rb
@@ -335,6 +342,7 @@ files:
 - lib/project_types/script/layers/infrastructure/script_service.rb
 - lib/project_types/script/layers/infrastructure/script_uploader.rb
 - lib/project_types/script/layers/infrastructure/service_locator.rb
+- lib/project_types/script/layers/infrastructure/sparse_checkout_details.rb
 - lib/project_types/script/loaders/project.rb
 - lib/project_types/script/loaders/specification_handler.rb
 - lib/project_types/script/messages/messages.rb
@@ -354,6 +362,7 @@ files:
 - lib/project_types/theme/commands/pull.rb
 - lib/project_types/theme/commands/push.rb
 - lib/project_types/theme/commands/serve.rb
+- lib/project_types/theme/commands/share.rb
 - lib/project_types/theme/conversions/base_glob.rb
 - lib/project_types/theme/conversions/ignore_glob.rb
 - lib/project_types/theme/conversions/include_glob.rb
@@ -465,6 +474,7 @@ files:
 - lib/shopify_cli/services/app/serve/node_service.rb
 - lib/shopify_cli/services/app/serve/php_service.rb
 - lib/shopify_cli/services/app/serve/rails_service.rb
+- lib/shopify_cli/services/app/serve/serve_service.rb
 - lib/shopify_cli/services/app/tunnel/auth_service.rb
 - lib/shopify_cli/services/app/tunnel/start_service.rb
 - lib/shopify_cli/services/app/tunnel/stop_service.rb