shopify-cli 2.7.0 → 2.7.4

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/node_service.rb

@@ -26,6 +26,8 @@ module ShopifyCLI
               verbose: verbose,
             })
 
+            raise ShopifyCLI::AbortSilent if form.nil?
+
             check_node
             check_npm
             build(form.name)

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

@@ -25,7 +25,7 @@ module ShopifyCLI
               type: type,
               verbose: verbose,
             })
-            return context.puts(self.class.help) if form.nil?
+            raise ShopifyCLI::AbortSilent if form.nil?
 
             check_php
             check_composer

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

@@ -39,6 +39,8 @@ module ShopifyCLI
             form_options[:rails_opts] = rails_opts unless rails_opts.nil?
             form = form_data(form_options)
 
+            raise ShopifyCLI::AbortSilent if form.nil?
+
             ruby_version = Rails::Ruby.version(context)
             context.abort(context.message("core.app.create.rails.error.invalid_ruby_version")) unless
               ruby_version.satisfies?("~>2.5") || ruby_version.satisfies?("~>3.0.0")
@@ -157,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

data/lib/shopify_cli/theme/dev_server/hot-reload.js

@@ -17,19 +17,48 @@
 
   connect();
 
+  function isRefreshRequired(files) {
+    return files.some((file) => !isCssFile(file) && !isSectionFile(file));
+  }
+
+  function refreshFile(file) {
+    if (isCssFile(file)) {
+      reloadCssFile(file);
+      return;
+    }
+
+    if (isSectionFile(file)) {
+      reloadSection(file);
+      return;
+    }
+  }
+
+  function setHotReloadCookie(files) {
+    var date = new Date();
+
+    // Hot reload cookie expires in 3 seconds
+    date.setSeconds(date.getSeconds() + 3);
+    
+    var sections = files.join(',');
+    var expires = date.toUTCString();
+
+    document.cookie = `hot_reload_sections=${sections}; expires=${expires}; path=/`;
+  }
+
+  function refreshPage(files) {
+    setHotReloadCookie(files);
+    console.log('[HotReload] Refreshing entire page');
+    window.location.reload();
+  }
+
   function handleUpdate(message) {
     var data = JSON.parse(message.data);
+    var modifiedFiles = data.modified;
 
-    // Assume only one file is modified at a time
-    var modified = data.modified[0];
-
-    if (isCssFile(modified)) {
-      reloadCssFile(modified)
-    } else if (isSectionFile(modified)) {
-      reloadSection(modified);
+    if (isRefreshRequired(modifiedFiles)) {
+      refreshPage(modifiedFiles);
     } else {
-      console.log(`[HotReload] Refreshing entire page`);
-      window.location.reload();
+      modifiedFiles.forEach(refreshFile);
     }
   }
 

data/lib/shopify_cli/theme/dev_server/proxy/template_param_builder.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require "cgi"
+
+module ShopifyCLI
+  module Theme
+    module DevServer
+      class Proxy
+        class TemplateParamBuilder
+          def build
+            # Core doesn't support replace_templates
+            return {} if core?(current_path)
+
+            (syncer_templates + request_templates)
+              .select { |file| file.liquid? || file.json? }
+              .uniq(&:relative_path)
+              .map { |file| as_param(file) }
+              .to_h
+          end
+
+          def with_core_endpoints(core_endpoints)
+            @core_endpoints = core_endpoints
+            self
+          end
+
+          def with_syncer(syncer)
+            @syncer = syncer
+            self
+          end
+
+          def with_rack_env(rack_env)
+            @rack_env = rack_env
+            self
+          end
+
+          def with_theme(theme)
+            @theme = theme
+            self
+          end
+
+          private
+
+          def as_param(file)
+            ["replace_templates[#{file.relative_path}]", file.read]
+          end
+
+          def syncer_templates
+            @syncer&.pending_updates || []
+          end
+
+          def request_templates
+            cookie_sections
+              .map { |section| @theme[section] unless @theme.nil? }
+              .compact
+          end
+
+          def cookie_sections
+            CGI::Cookie.parse(cookie)["hot_reload_sections"].join.split(",") || []
+          end
+
+          def core?(path)
+            core_endpoints.include?(path)
+          end
+
+          def current_path
+            rack_env["PATH_INFO"]
+          end
+
+          def cookie
+            rack_env["HTTP_COOKIE"]
+          end
+
+          def core_endpoints
+            @core_endpoints || []
+          end
+
+          def rack_env
+            @rack_env || {}
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,9 @@
 require "net/http"
 require "stringio"
 require "time"
+require "cgi"
+
+require_relative "proxy/template_param_builder"
 
 module ShopifyCLI
   module Theme
@@ -112,21 +115,12 @@ module ShopifyCLI
         end
 
         def build_replace_templates_param(env)
-          params = {}
-
-          # Core doesn't support replace_templates
-          return params if @core_endpoints.include?(env["PATH_INFO"])
-
-          pending_templates = @syncer.pending_updates.select do |file|
-            # Only replace Liquid or JSON files
-            file.liquid? || file.json?
-          end
-
-          pending_templates.each do |path|
-            params["replace_templates[#{path.relative_path}]"] = path.read
-          end
-
-          params
+          TemplateParamBuilder.new
+            .with_core_endpoints(@core_endpoints)
+            .with_syncer(@syncer)
+            .with_theme(@theme)
+            .with_rack_env(env)
+            .build
         end
 
         def add_session_cookie(cookie_header)

data/lib/shopify_cli/theme/dev_server.rb

@@ -3,6 +3,7 @@ require_relative "development_theme"
 require_relative "ignore_filter"
 require_relative "syncer"
 
+require_relative "dev_server/cdn_fonts"
 require_relative "dev_server/hot_reload"
 require_relative "dev_server/header_hash"
 require_relative "dev_server/local_assets"
@@ -24,7 +25,7 @@ module ShopifyCLI
       class << self
         attr_accessor :ctx
 
-        def start(ctx, root, http_bind: "127.0.0.1", port: 9292, poll: false)
+        def start(ctx, root, host: "127.0.0.1", port: 9292, poll: false)
           @ctx = ctx
           theme = DevelopmentTheme.new(ctx, root: root)
           ignore_filter = IgnoreFilter.from_path(root)
@@ -33,9 +34,11 @@ module ShopifyCLI
 
           # Setup the middleware stack. Mimics Rack::Builder / config.ru, but in reverse order
           @app = Proxy.new(ctx, theme: theme, syncer: @syncer)
+          @app = CdnFonts.new(@app, theme: theme)
           @app = LocalAssets.new(ctx, @app, theme: theme)
           @app = HotReload.new(ctx, @app, theme: theme, watcher: watcher, ignore_filter: ignore_filter)
           stopped = false
+          address = "http://#{host}:#{port}"
 
           theme.ensure_exists!
 
@@ -44,8 +47,8 @@ module ShopifyCLI
             stop
           end
 
-          CLI::UI::Frame.open(@ctx.message("theme.serve.serve")) do
-            ctx.print_task("Syncing theme ##{theme.id} on #{theme.shop}")
+          CLI::UI::Frame.open(@ctx.message("theme.serve.viewing_theme")) do
+            ctx.print_task(ctx.message("theme.serve.syncing_theme", theme.id, theme.shop))
             @syncer.start_threads
             if block_given?
               yield @syncer
@@ -55,18 +58,9 @@ module ShopifyCLI
 
             return if stopped
 
-            ctx.puts("")
-            ctx.puts("Serving #{theme.root}")
-            ctx.puts("")
-            ctx.open_url!("http://127.0.0.1:#{port}")
-            ctx.puts("")
-            ctx.puts("Customize this theme in the Online Store Editor:")
-            ctx.puts("{{green:#{theme.editor_url}}}")
-            ctx.puts("")
-            ctx.puts("Share this theme preview:")
-            ctx.puts("{{green:#{theme.preview_url}}}")
-            ctx.puts("")
-            ctx.puts("(Use Ctrl-C to stop)")
+            ctx.puts(ctx.message("theme.serve.serving", theme.root))
+            ctx.open_url!(address)
+            ctx.puts(ctx.message("theme.serve.customize_or_preview", theme.editor_url, theme.preview_url))
           end
 
           logger = if ctx.debug?
@@ -78,7 +72,7 @@ module ShopifyCLI
           watcher.start
           WebServer.run(
             @app,
-            BindAddress: http_bind,
+            BindAddress: host,
             Port: port,
             Logger: logger,
             AccessLog: [],
@@ -87,10 +81,11 @@ module ShopifyCLI
 
         rescue ShopifyCLI::API::APIRequestForbiddenError,
                ShopifyCLI::API::APIRequestUnauthorizedError
-          @ctx.abort("You are not authorized to edit themes on #{theme.shop}.\n" \
-                     "Make sure you are a user of that store, and allowed to edit themes.")
+          raise ShopifyCLI::Abort, @ctx.message("theme.serve.ensure_user", theme.shop)
+        rescue Errno::EADDRINUSE
+          abort_address_already_in_use(address)
         rescue Errno::EADDRNOTAVAIL
-          raise AddressBindingError, "Error binding to the address #{http_bind}."
+          raise AddressBindingError, "Error binding to the address #{host}."
         end
 
         def stop
@@ -99,6 +94,24 @@ module ShopifyCLI
           @syncer.shutdown
           WebServer.shutdown
         end
+
+        private
+
+        def abort_address_already_in_use(address)
+          open_frame(@ctx.message("theme.serve.already_in_use_error"), color: :red) do
+            @ctx.puts(@ctx.message("theme.serve.address_already_in_use", address))
+          end
+
+          open_frame(@ctx.message("theme.serve.try_this"), color: :green) do
+            @ctx.puts(@ctx.message("theme.serve.try_port_option"))
+          end
+
+          raise ShopifyCLI::AbortSilent
+        end
+
+        def open_frame(title, color:, &block)
+          CLI::UI::Frame.open(title, color: CLI::UI.resolve_color(color), timing: false, &block)
+        end
       end
     end
   end

data/lib/shopify_cli/theme/syncer/error_reporter.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  module Theme
+    class Syncer
+      ##
+      # ShopifyCLI::Theme::Syncer::ErrorReporter allows delaying log of errors,
+      # mainly to not break the progress bar.
+      #
+      class ErrorReporter
+        attr_reader :ctx, :delayed_errors
+
+        def initialize(ctx)
+          @ctx = ctx
+          @has_any_error = false
+          @delay_errors = false
+          @delayed_errors = []
+        end
+
+        def disable!
+          @delay_errors = true
+        end
+
+        def enable!
+          @delay_errors = false
+          @delayed_errors.each { |error| report(error) }
+          @delayed_errors.clear
+        end
+
+        def report(error_message)
+          if @delay_errors
+            @delayed_errors << error_message
+          else
+            @has_any_error = true
+            @ctx.error(error_message)
+          end
+        end
+
+        def has_any_error?
+          @has_any_error
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/theme/syncer/operation.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  module Theme
+    class Syncer
+      class Operation
+        attr_accessor :method, :file
+
+        COLOR_BY_STATUS = {
+          error: :red,
+          synced: :green,
+          fixed: :cyan,
+        }
+
+        def initialize(ctx, method, file)
+          @ctx = ctx
+          @method = method
+          @file = file
+        end
+
+        def to_s
+          "#{method} #{file_path}"
+        end
+
+        def as_error_message
+          as_message_with(status: :error)
+        end
+
+        def as_synced_message
+          as_message_with(status: :synced)
+        end
+
+        def as_fix_message
+          as_message_with(status: :fixed)
+        end
+
+        def file_path
+          file&.relative_path.to_s
+        end
+
+        private
+
+        def as_message_with(status:)
+          status_color = COLOR_BY_STATUS[status]
+          status_text = @ctx.message("theme.serve.operation.status.#{status}").ljust(6)
+
+          "#{timestamp} {{#{status_color}:#{status_text}}} {{>}} {{blue:#{self}}}"
+        end
+
+        def timestamp
+          Time.now.strftime("%T")
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/theme/syncer/standard_reporter.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  module Theme
+    class Syncer
+      ##
+      # ShopifyCLI::Theme::Syncer::StdReporter allows disabling/enabling
+      # messages reported in the standard output (ShopifyCLI::Context#puts).
+      #
+      class StandardReporter
+        attr_reader :ctx
+
+        def initialize(ctx)
+          @enabled = true
+          @ctx = ctx
+        end
+
+        def disable!
+          @enabled = false
+        end
+
+        def enable!
+          @enabled = true
+        end
+
+        def report(message)
+          ctx.puts(message) if @enabled
+        end
+      end
+    end
+  end
+end