shopify-cli 2.7.2 → 2.9.0

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

@@ -229,6 +229,7 @@ module ShopifyCLI
       uri = URI.parse("#{auth_url}#{endpoint}")
       https = Net::HTTP.new(uri.host, uri.port)
       https.use_ssl = true
+      https.verify_mode = OpenSSL::SSL::VERIFY_NONE if ENV["SSL_VERIFY_NONE"]
       request = Net::HTTP::Post.new(uri.path)
       request["User-Agent"] = "Shopify CLI #{::ShopifyCLI::VERSION}"
       request.body = URI.encode_www_form(params)

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.
@@ -409,7 +415,7 @@ module ShopifyCLI
               Usage: {{command:%s login [--store=STORE]}}
           HELP
           invalid_shop: <<~MESSAGE,
-            Invalid store provided (%s). Please provide the store in the following format: my-store.myshopify.com
+            Invalid store provided (%s). Please make sure that the store belongs to your partner organization, and provide the store in the following format: my-store.myshopify.com
           MESSAGE
           shop_prompt: <<~PROMPT,
             What store are you connecting to? (e.g. my-store.myshopify.com; do {{bold:NOT}} include protocol part, e.g., https://)
@@ -719,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",
@@ -784,6 +790,8 @@ module ShopifyCLI
           logged_in_partner_only: "Logged into partner organization {{green:%s}}",
           logged_in_partner_and_shop: "Logged into store {{green:%s}} in partner organization {{green:%s}}",
         },
+        error: "Error",
+        try_this: "Try this",
       },
     }.freeze
   end

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
       ##

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,13 +14,21 @@ module ShopifyCLI
       }
 
       class << self
-        def read(_directory = Dir.pwd)
-          input = parse_external_env
+        def path(directory)
+          File.join(directory, FILENAME)
+        end
+
+        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))
+          File.read(path(directory))
             .gsub("\r\n", "\n").split("\n").each_with_object({}) do |line, output|
             match = /\A([A-Za-z_0-9]+)\s*=\s*(.*)\z/.match(line)
             if match
@@ -37,10 +45,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 +65,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/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

@@ -15,21 +15,64 @@
     eventSource.onerror = () => eventSource.close();
   }
 
-  connect();
+  function reloadMode() {
+    var namespace = window.__SHOPIFY_CLI_ENV__;
+    return namespace.mode;
+  }
+
+  function isFullPageReloadMode(){
+    return reloadMode() === "full-page";
+  }
+
+  function isReloadModeActive(){
+    return reloadMode() !== "off";
+  }
+
+  function isRefreshRequired(files) {
+    if (isFullPageReloadMode()) {
+      return true;
+    }
+    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);
     }
   }
 
@@ -90,4 +133,8 @@
       }
     }
   }
+
+  if (isReloadModeActive()) {
+    connect();
+  }
 })();

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

@@ -4,10 +4,11 @@ module ShopifyCLI
   module Theme
     module DevServer
       class HotReload
-        def initialize(ctx, app, theme:, watcher:, ignore_filter: nil)
+        def initialize(ctx, app, theme:, watcher:, mode:, ignore_filter: nil)
           @ctx = ctx
           @app = app
           @theme = theme
+          @mode = mode
           @streams = SSE::Streams.new
           @watcher = watcher
           @watcher.add_observer(self, :notify_streams_of_file_change)
@@ -48,12 +49,27 @@ module ShopifyCLI
 
         def inject_hot_reload_javascript(body)
           hot_reload_js = ::File.read("#{__dir__}/hot-reload.js")
-          hot_reload_script = "<script>\n#{hot_reload_js}</script>"
+          hot_reload_script = [
+            "<script>",
+            params_js,
+            hot_reload_js,
+            "</script>",
+          ].join("\n")
+
           body = body.join.gsub("</body>", "#{hot_reload_script}\n</body>")
 
           [body]
         end
 
+        def params_js
+          env = { mode: @mode }
+          <<~JS
+            (() => {
+              window.__SHOPIFY_CLI_ENV__ = #{env.to_json};
+            })();
+          JS
+        end
+
         def create_stream
           stream = @streams.new
 

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
@@ -15,6 +18,7 @@ module ShopifyCLI
         "trailer",
         "transfer-encoding",
         "upgrade",
+        "content-security-policy",
       ]
 
       class Proxy
@@ -112,21 +116,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/reload_mode.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  module Theme
+    module DevServer
+      class ReloadMode
+        MODES = [:"hot-reload", :"full-page", :off]
+
+        class << self
+          def default
+            :"hot-reload"
+          end
+
+          def get!(mode)
+            MODES.find { |m| m == mode.to_sym } || raise_error(mode)
+          end
+
+          private
+
+          def raise_error(invalid_mode)
+            error_message = ShopifyCLI::Context.message("theme.serve.reload_mode_is_not_valid", invalid_mode)
+            help_message = ShopifyCLI::Context.message("theme.serve.try_a_valid_reload_mode", valid_modes)
+
+            ShopifyCLI::Context.abort(error_message, help_message)
+          end
+
+          def valid_modes
+            MODES.map { |v| "`#{v}`" }.join(", ")
+          end
+        end
+      end
+    end
+  end
+end