shopify-cli 2.7.1 → 2.8.0

data/lib/project_types/theme/commands/push.rb

@@ -10,6 +10,7 @@ module Theme
       options do |parser, flags|
         parser.on("-n", "--nodelete") { flags[:nodelete] = true }
         parser.on("-i", "--themeid=ID") { |theme_id| flags[:theme_id] = theme_id }
+        parser.on("-l", "--live") { flags[:live] = true }
         parser.on("-d", "--development") { flags[:development] = true }
         parser.on("-u", "--unpublished") { flags[:unpublished] = true }
         parser.on("-j", "--json") { flags[:json] = true }
@@ -27,6 +28,8 @@ module Theme
 
         theme = if (theme_id = options.flags[:theme_id])
           ShopifyCLI::Theme::Theme.new(@ctx, root: root, id: theme_id)
+        elsif options.flags[:live]
+          ShopifyCLI::Theme::Theme.live(@ctx, root: root)
         elsif options.flags[:development]
           theme = ShopifyCLI::Theme::DevelopmentTheme.new(@ctx, root: root)
           theme.ensure_exists!
@@ -48,7 +51,9 @@ module Theme
         end
 
         if theme.live? && !options.flags[:allow_live]
-          return unless CLI::UI::Prompt.confirm(@ctx.message("theme.push.live"))
+          question = @ctx.message("theme.push.live")
+          question += @ctx.message("theme.push.theme", theme.name, theme.id) if options.flags[:live]
+          return unless CLI::UI::Prompt.confirm(question)
         end
 
         ignore_filter = ShopifyCLI::Theme::IgnoreFilter.from_path(root)
@@ -72,6 +77,7 @@ module Theme
               @ctx.done(@ctx.message("theme.push.done", theme.preview_url, theme.editor_url))
             end
           end
+          raise ShopifyCLI::AbortSilent if syncer.has_any_error?
         rescue ShopifyCLI::API::APIRequestNotFoundError
           @ctx.abort(@ctx.message("theme.push.theme_not_found", theme.id))
         ensure

data/lib/project_types/theme/commands/serve.rb

@@ -15,7 +15,7 @@ module Theme
       def call(*)
         flags = options.flags.dup
         host = flags[:host] || DEFAULT_HTTP_HOST
-        ShopifyCLI::Theme::DevServer.start(@ctx, ".", http_bind: host, **flags) do |syncer|
+        ShopifyCLI::Theme::DevServer.start(@ctx, ".", host: host, **flags) do |syncer|
           UI::SyncProgressBar.new(syncer).progress(:upload_theme!, delay_low_priority_files: true)
         end
       rescue ShopifyCLI::Theme::DevServer::AddressBindingError

data/lib/project_types/theme/messages/messages.rb

@@ -58,6 +58,7 @@ module Theme
 
               Options:
                 {{command:-i, --themeid=THEMEID}} Theme ID. Must be an existing theme on your store.
+                {{command:-l, --live}}            Push to your remote live theme, and update your live store.
                 {{command:-d, --development}}     Push to your remote development theme, and create it if needed.
                 {{command:-u, --unpublished}}     Create a new unpublished theme and push to it.
                 {{command:-n, --nodelete}}        Runs the push command without deleting remote files from Shopify.
@@ -73,6 +74,7 @@ module Theme
           push: "Pushing theme files to Shopify",
           select: "Select theme to push to",
           live: "Are you sure you want to push to your live theme?",
+          theme: "\n  Theme: {{blue:%s #%s}} {{green:[live]}}",
           theme_not_found: "Theme #%s doesn't exist",
           done: <<~DONE,
             {{green:Your theme was pushed successfully}}
@@ -99,6 +101,13 @@ module Theme
           viewing_theme: "Viewing theme…",
           syncing_theme: "Syncing theme #%s on %s",
           open_fail: "Couldn't open the theme",
+          operation: {
+            status: {
+              error: "ERROR",
+              synced: "Synced",
+              fixed: "Fixed",
+            },
+          },
           error: {
             address_binding_error: "Couldn't bind to localhost."\
               " To serve your theme, set a different address with {{command:%s theme serve --host=<address>}}",
@@ -181,6 +190,7 @@ module Theme
 
             Options:
               {{command:-i, --themeid=THEMEID}} The Theme ID. Must be an existing theme on your store.
+              {{command:-l, --live}}            Pull theme files from your remote live theme.
               {{command:-n, --nodelete}}        Runs the pull command without deleting local files.
 
             Run without options to select theme from a list.

data/lib/project_types/theme/ui/sync_progress_bar.rb

@@ -6,14 +6,14 @@ module Theme
       end
 
       def progress(method, **args)
-        @syncer.delay_errors!
+        @syncer.lock_io!
         CLI::UI::Progress.progress do |bar|
           @syncer.public_send(method, **args) do |left, total|
             bar.tick(set_percent: 1 - left.to_f / total)
           end
           bar.tick(set_percent: 1)
         end
-        @syncer.report_errors!
+        @syncer.unlock_io!
       end
     end
   end

data/lib/shopify_cli/command/project_command.rb

@@ -5,13 +5,26 @@ module ShopifyCLI
         @ctx.puts(self.class.help)
       end
 
-      def self.help
-        project_type = name.split("::")[0].downcase
-        ShopifyCLI::Context.message(
-          "#{project_type}.help",
-          ShopifyCLI::TOOL_NAME,
-          subcommand_registry.command_names.join(" | ")
-        )
+      class << self
+        def help
+          project_type = name.split("::")[0].downcase
+          ShopifyCLI::Context.message(
+            "#{project_type}.help",
+            ShopifyCLI::TOOL_NAME,
+            available_subcommands
+          )
+        end
+
+        private
+
+        def available_subcommands
+          subcommand_registry
+            .resolved_commands
+            .reject { |_name, command| command.hidden? }
+            .keys
+            .sort
+            .join(" | ")
+        end
       end
     end
   end

data/lib/shopify_cli/command.rb

@@ -29,6 +29,12 @@ module ShopifyCLI
           run_prerequisites
           cmd.call(args, command_name)
         end
+      rescue OptionParser::InvalidOption => error
+        arg = error.args.first
+        raise ShopifyCLI::Abort, @ctx.message("core.errors.option_parser.invalid_option", arg)
+      rescue OptionParser::MissingArgument => error
+        arg = error.args.first
+        raise ShopifyCLI::Abort, @ctx.message("core.errors.option_parser.missing_argument", arg)
       end
 
       def options(&block)

data/lib/shopify_cli/commands/app/create/node.rb

@@ -3,9 +3,7 @@ module ShopifyCLI
     class App
       class Create
         class Node < ShopifyCLI::Command::AppSubCommand
-          unless ShopifyCLI::Environment.acceptance_test?
-            prerequisite_task :ensure_authenticated
-          end
+          prerequisite_task :ensure_authenticated
 
           options do |parser, flags|
             parser.on("--name=NAME") { |t| flags[:name] = t }

data/lib/shopify_cli/commands/app/create/rails.rb

@@ -3,9 +3,7 @@ module ShopifyCLI
     class App
       class Create
         class Rails < ShopifyCLI::Command::AppSubCommand
-          unless ShopifyCLI::Environment.acceptance_test?
-            prerequisite_task :ensure_authenticated
-          end
+          prerequisite_task :ensure_authenticated
 
           options do |parser, flags|
             parser.on("--name=NAME") { |t| flags[:name] = t }

data/lib/shopify_cli/commands/login.rb

@@ -7,7 +7,7 @@ module ShopifyCLI
       PERMANENT_DOMAIN_SUFFIX = /\.myshopify\.(com|io)$/
 
       options do |parser, flags|
-        parser.on("--store=STORE") { |url| flags[:shop] = url }
+        parser.on("-s", "--store=STORE") { |url| flags[:shop] = url }
         # backwards compatibility allow 'shop' for now
         parser.on("--shop=SHOP") { |url| flags[:shop] = url }
         parser.on("--password=PASSWORD") { |password| flags[:password] = password }

data/lib/shopify_cli/commands/switch.rb

@@ -4,7 +4,7 @@ module ShopifyCLI
   module Commands
     class Switch < ShopifyCLI::Command
       options do |parser, flags|
-        parser.on("--store=STORE") { |url| flags[:shop] = url }
+        parser.on("-s", "--store=STORE") { |url| flags[:shop] = url }
         # backwards compatibility allow 'shop' for now
         parser.on("--shop=SHOP") { |url| flags[:shop] = url }
       end

data/lib/shopify_cli/constants.rb

@@ -46,6 +46,9 @@ module ShopifyCLI
       ACCEPTANCE_TEST = "SHOPIFY_CLI_ACCEPTANCE_TEST"
       DEVELOPMENT = "SHOPIFY_CLI_DEVELOPMENT"
 
+      # Authentication
+      AUTH_TOKEN = "SHOPIFY_CLI_AUTH_TOKEN"
+
       # Monorail
       MONORAIL_REAL_EVENTS = "MONORAIL_REAL_EVENTS"
     end
@@ -58,5 +61,9 @@ module ShopifyCLI
     module Links
       NEW_ISSUE = "https://github.com/Shopify/shopify-cli/issues/new"
     end
+
+    module Extension
+      DEFAULT_PORT = 39351
+    end
   end
 end

data/lib/shopify_cli/context.rb

@@ -61,6 +61,7 @@ module ShopifyCLI
     # will return which operating system that the cli is running on [:mac, :linux]
     def os
       host = uname
+      return :mac_m1 if /arm64-apple-darwin/i.match(host)
       return :mac if /darwin/i.match(host)
       return :windows if /mswin|mingw|cygwin/i.match(host)
       return :linux if /linux|bsd/i.match(host)
@@ -89,7 +90,7 @@ module ShopifyCLI
 
     # will return true if being launched from a tty
     def tty?
-      $stdin.tty? && !testing?
+      !testing? && $stdin.tty?
     end
 
     # will return true if the cli is being run from an installation, and not a
@@ -357,6 +358,15 @@ module ShopifyCLI
       Kernel.puts(CLI::UI.fmt(*args))
     end
 
+    # a wrapper around $stderr.puts to allow for easy formatting
+    #
+    # #### Parameters
+    # * `text` - a string message to output
+    #
+    def error(text)
+      $stderr.puts(CLI::UI.fmt(text))
+    end
+
     # a wrapper around Kernel.warn to allow for easy formatting
     #
     # #### Parameters

data/lib/shopify_cli/environment.rb

@@ -86,6 +86,10 @@ module ShopifyCLI
       )
     end
 
+    def self.auth_token(env_variables: ENV)
+      env_variables[Constants::EnvironmentVariables::AUTH_TOKEN]
+    end
+
     def self.env_variable_truthy?(variable_name, env_variables: ENV)
       TRUTHY_ENV_VARIABLE_VALUES.include?(env_variables[variable_name.to_s])
     end

data/lib/shopify_cli/form.rb

@@ -15,6 +15,8 @@ module ShopifyCLI
         rescue ShopifyCLI::Abort => err
           ctx.puts(err.message)
           nil
+        rescue ShopifyCLI::AbortSilent
+          nil
         end
       end
 

data/lib/shopify_cli/git.rb

@@ -8,6 +8,8 @@ module ShopifyCLI
       def available?(ctx)
         _output, status = ctx.capture2e("git", "status")
         status.success?
+      rescue Errno::ENOENT # git is not installed
+        false
       end
 
       ##

data/lib/shopify_cli/identity_auth.rb

@@ -68,6 +68,24 @@ module ShopifyCLI
       request_exchange_tokens
     end
 
+    def self.fetch_or_auth_partners_token(ctx:)
+      env_var_auth_token = Environment.auth_token
+      return env_var_auth_token if env_var_auth_token
+
+      ShopifyCLI::DB.get(:partners_exchange_token) do
+        IdentityAuth.new(ctx: ctx).authenticate
+        ShopifyCLI::DB.get(:partners_exchange_token)
+      end
+    end
+
+    def self.environment_auth_token?
+      !!Environment.auth_token
+    end
+
+    def self.authenticated?
+      environment_auth_token? || IDENTITY_ACCESS_TOKENS.all? { |key| ShopifyCLI::DB.exists?(key) }
+    end
+
     def reauthenticate
       return if refresh_exchange_tokens || refresh_access_tokens
       ctx.abort(ctx.message("core.identity_auth.error.reauthenticate", ShopifyCLI::TOOL_NAME))

data/lib/shopify_cli/messages/messages.rb

@@ -14,6 +14,12 @@ module ShopifyCLI
         },
       },
       core: {
+        errors: {
+          option_parser: {
+            invalid_option: "The option {{command:%s}} is not supported.",
+            missing_argument: "The required argument {{command:%s}} is missing.",
+          },
+        },
         app: {
           help: <<~HELP,
           Suite of commands for developing apps. See {{command:%1$s app <command> --help}} for usage of each command.
@@ -457,6 +463,7 @@ module ShopifyCLI
             not_authenticated: "Failed to authenticate",
           },
           login_prompt: "Please ensure you've logged in with {{command:%s login}} and try again",
+          token_authentication: "%s environment variable. We'll authenticate using its value as a token.",
         },
 
         options: {
@@ -718,7 +725,7 @@ module ShopifyCLI
           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 [ node | rails ] tunnel auth <token>}}.
+            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",

data/lib/shopify_cli/partners_api/app_extensions/job.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "shopify_cli/thread_pool/job"
+
+module ShopifyCLI
+  class PartnersAPI
+    class AppExtensions
+      class Job < ShopifyCLI::ThreadPool::Job
+        attr_reader :result
+
+        def initialize(ctx, app, type)
+          super()
+          @ctx = ctx
+          @app = app
+          @api_key = @app["apiKey"]
+          @type = type
+        end
+
+        def perform!
+          resp = PartnersAPI.query(@ctx, "get_extension_registrations", **params)
+          @result = resp&.dig("data", "app") || {}
+        end
+
+        def patch_app_with_extensions!
+          @app.merge!(result)
+        end
+
+        private
+
+        def params
+          { api_key: @api_key, type: @type }
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/partners_api/app_extensions.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require "shopify_cli/thread_pool"
+
+require_relative "app_extensions/job"
+
+module ShopifyCLI
+  class PartnersAPI
+    class AppExtensions
+      class << self
+        def fetch_apps_extensions(ctx, orgs, type)
+          jobs = apps(orgs).map { |app| AppExtensions::Job.new(ctx, app, type) }
+
+          consume_jobs!(jobs)
+          patch_apps_with_extensions!(jobs)
+
+          orgs
+        end
+
+        private
+
+        def apps(orgs)
+          orgs.flat_map { |org| org["apps"] }
+        end
+
+        def consume_jobs!(jobs)
+          thread_pool = ShopifyCLI::ThreadPool.new
+          jobs.each do |job|
+            thread_pool.schedule(job)
+          end
+          thread_pool.shutdown
+
+          raise_if_any_error(jobs)
+        end
+
+        def patch_apps_with_extensions!(jobs)
+          jobs.each(&:patch_app_with_extensions!)
+        end
+
+        def raise_if_any_error(jobs)
+          jobs.find(&:error?).tap { |job| raise job.error if job }
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/partners_api/organizations.rb

@@ -28,11 +28,8 @@ module ShopifyCLI
         end
 
         def fetch_with_extensions(ctx, type)
-          resp = PartnersAPI.query(ctx, "all_orgs_with_extensions", type: type)
-          (resp&.dig("data", "organizations", "nodes") || []).map do |org|
-            org["apps"] = (org.dig("apps", "nodes") || [])
-            org
-          end
+          orgs = fetch_with_app(ctx)
+          AppExtensions.fetch_apps_extensions(ctx, orgs, type)
         end
       end
     end

data/lib/shopify_cli/partners_api.rb

@@ -7,6 +7,7 @@ module ShopifyCLI
   #
   class PartnersAPI < API
     autoload :Organizations, "shopify_cli/partners_api/organizations"
+    autoload :AppExtensions, "shopify_cli/partners_api/app_extensions"
 
     class << self
       ##
@@ -61,18 +62,11 @@ module ShopifyCLI
       def api_client(ctx)
         new(
           ctx: ctx,
-          token: access_token(ctx),
+          token: IdentityAuth.fetch_or_auth_partners_token(ctx: ctx),
           url: "https://#{Environment.partners_domain}/api/cli/graphql",
         )
       end
 
-      def access_token(ctx)
-        ShopifyCLI::DB.get(:partners_exchange_token) do
-          IdentityAuth.new(ctx: ctx).authenticate
-          ShopifyCLI::DB.get(:partners_exchange_token)
-        end
-      end
-
       def auth_failure_info(ctx, error)
         if error.response
           headers = %w(www-authenticate x-request-id)

data/lib/shopify_cli/project.rb

@@ -107,13 +107,6 @@ module ShopifyCLI
         @dir = nil
       end
 
-      private
-
-      def directory(dir)
-        @dir ||= Hash.new { |h, k| h[k] = __directory(k) }
-        @dir[dir]
-      end
-
       def at(dir)
         proj_dir = directory(dir)
         unless proj_dir
@@ -123,6 +116,13 @@ module ShopifyCLI
         @at[proj_dir]
       end
 
+      private
+
+      def directory(dir)
+        @dir ||= Hash.new { |h, k| h[k] = __directory(k) }
+        @dir[dir]
+      end
+
       def __directory(curr)
         loop do
           return nil if curr == "/" || /^[A-Z]:\/$/.match?(curr)
@@ -134,6 +134,7 @@ module ShopifyCLI
     end
 
     property :directory # :nodoc:
+    property :env # :nodoc:
 
     ##
     # will read, parse and return the envfile for the project

data/lib/shopify_cli/resources/env_file.rb

@@ -14,11 +14,15 @@ module ShopifyCLI
       }
 
       class << self
-        def read(_directory = Dir.pwd)
-          input = parse_external_env
+        def read(_directory = Dir.pwd, overrides: {})
+          input = parse_external_env(overrides: overrides)
           new(input)
         end
 
+        def from_hash(hash)
+          new(env_input(hash))
+        end
+
         def parse(directory)
           File.read(File.join(directory, FILENAME))
             .gsub("\r\n", "\n").split("\n").each_with_object({}) do |line, output|
@@ -37,10 +41,14 @@ module ShopifyCLI
           end
         end
 
-        def parse_external_env(directory = Dir.pwd)
+        def parse_external_env(directory = Dir.pwd, overrides: {})
+          env_input(parse(directory), overrides: overrides)
+        end
+
+        def env_input(parsed_source, overrides: {})
           env_details = {}
           extra = {}
-          parse(directory).each do |key, value|
+          parsed_source.merge(overrides).each do |key, value|
             if KEY_MAP[key]
               env_details[KEY_MAP[key]] = value
             else
@@ -53,7 +61,7 @@ module ShopifyCLI
       end
 
       property :api_key, required: true
-      property :secret, required: true
+      property :secret
       property :shop
       property :scopes
       property :host

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

@@ -159,10 +159,10 @@ module ShopifyCLI
 
             CLI::UI::Frame.open(context.message("core.app.create.rails.generating_app", name)) do
               new_command = %w(rails new)
+              new_command << name
               new_command += DEFAULT_RAILS_FLAGS
               new_command << "--database=#{db}"
               new_command += rails_opts.split unless rails_opts.nil?
-              new_command << name
 
               syscall(new_command)
             end

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

@@ -14,7 +14,7 @@ module ShopifyCLI
 
           def call
             project = ShopifyCLI::Project.current
-            url = host || ShopifyCLI::Tunnel.start(context)
+            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)

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

@@ -14,7 +14,7 @@ module ShopifyCLI
 
           def call
             project = ShopifyCLI::Project.current
-            url = host || ShopifyCLI::Tunnel.start(context)
+            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)

data/lib/shopify_cli/tasks/ensure_authenticated.rb

@@ -4,9 +4,15 @@ module ShopifyCLI
   module Tasks
     class EnsureAuthenticated < ShopifyCLI::Task
       def call(ctx)
-        ctx.abort(
-          ctx.message("core.identity_auth.login_prompt", ShopifyCLI::TOOL_NAME)
-        ) unless ShopifyCLI::IdentityAuth::IDENTITY_ACCESS_TOKENS.all? { |key| ShopifyCLI::DB.exists?(key) }
+        return if ShopifyCLI::Environment.acceptance_test?
+        unless ShopifyCLI::IdentityAuth.authenticated?
+          raise ShopifyCLI::Abort,
+            ctx.message("core.identity_auth.login_prompt", ShopifyCLI::TOOL_NAME)
+        end
+        if ShopifyCLI::IdentityAuth.environment_auth_token?
+          ctx.puts(ctx.message("core.identity_auth.token_authentication",
+            ShopifyCLI::Constants::EnvironmentVariables::AUTH_TOKEN))
+        end
       end
     end
   end

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  module Theme
+    module DevServer
+      class CdnFonts
+        FONTS_PATH = "/fonts"
+        FONTS_CDN = "https://fonts.shopifycdn.com"
+        FONTS_REGEX = %r{#{FONTS_CDN}}
+
+        def initialize(app, theme:)
+          @app = app
+          @theme = theme
+        end
+
+        def call(env)
+          path = env["PATH_INFO"]
+
+          # Serve from fonts CDN
+          return serve_font(env) if path.start_with?(FONTS_PATH)
+
+          # Proxy the request, and replace the URLs in the response
+          status, headers, body = @app.call(env)
+          body = replace_font_urls(body)
+          [status, headers, body]
+        end
+
+        private
+
+        def serve_font(env)
+          parameters = %w(PATH_INFO QUERY_STRING REQUEST_METHOD rack.input)
+          path, query, method, body_stream = *env.slice(*parameters).values
+
+          uri = fonts_cdn_uri(path, query)
+
+          response = Net::HTTP.start(uri.host, 443, use_ssl: true) do |http|
+            req_class = Net::HTTP.const_get(method.capitalize)
+            req = req_class.new(uri)
+            req.initialize_http_header(fonts_cdn_headers)
+            req.body_stream = body_stream
+            http.request(req)
+          end
+
+          [
+            response.code.to_s,
+            {
+              "Content-Type" => response.content_type,
+              "Content-Length" => response.content_length.to_s,
+            },
+            [response.body],
+          ]
+        end
+
+        def fonts_cdn_headers
+          {
+            "Referer" => "https://#{@theme.shop}",
+            "Transfer-Encoding" => "chunked",
+          }
+        end
+
+        def fonts_cdn_uri(path, query)
+          uri = URI.join("#{FONTS_CDN}/", path.gsub(%r{^#{FONTS_PATH}\/}, ""))
+          uri.query = query.split("&").last
+          uri
+        end
+
+        def replace_font_urls(body)
+          [body.join.gsub(FONTS_REGEX, FONTS_PATH)]
+        end
+      end
+    end
+  end
+end