shopify-cli 2.0.0 → 2.2.0

data/lib/project_types/script/commands/create.rb

@@ -34,7 +34,7 @@ module Script
       end
 
       def self.help
-        allowed_values = Script::Layers::Application::ExtensionPoints.types.map { |type| "{{cyan:#{type}}}" }
+        allowed_values = Script::Layers::Application::ExtensionPoints.available_types.map { |type| "{{cyan:#{type}}}" }
         ShopifyCli::Context.message("script.create.help", ShopifyCli::TOOL_NAME, allowed_values.join(", "))
       end
     end

data/lib/project_types/script/graphql/app_script_update_or_create.graphql

@@ -9,9 +9,9 @@ mutation AppScriptUpdateOrCreate(
   $schemaMinorVersion: String,
   $useMsgpack: Boolean,
   $uuid: String,
-  $configurationUi: Boolean,
-  $scriptJsonVersion: String,
-  $configurationDefinition: String,
+  $configurationUi: Boolean!,
+  $scriptJsonVersion: String!,
+  $configurationDefinition: String!,
 ) {
   appScriptUpdateOrCreate(
     extensionPointName: $extensionPointName

data/lib/project_types/script/layers/infrastructure/script_service.rb

@@ -75,19 +75,30 @@ module Script
         class ScriptServiceAPI < ShopifyCli::API
           property(:api_key, accepts: String)
 
+          LOCAL_INSTANCE_URL = "https://script-service.myshopify.io"
+
           def self.query(ctx, query_name, api_key: nil, variables: {})
             api_client(ctx, api_key).query(query_name, variables: variables)
           end
 
           def self.api_client(ctx, api_key)
+            instance_url = spin_instance_url || LOCAL_INSTANCE_URL
             new(
               ctx: ctx,
-              url: "https://script-service.myshopify.io/graphql",
+              url: "#{instance_url}/graphql",
               token: "",
               api_key: api_key
             )
           end
 
+          def self.spin_instance_url
+            workspace = ENV["SPIN_WORKSPACE"]
+            namespace = ENV["SPIN_NAMESPACE"]
+            return if workspace.nil? || namespace.nil?
+
+            "https://script-service.#{workspace}.#{namespace}.us.spin.dev"
+          end
+
           def auth_headers(*)
             tokens = { "APP_KEY" => api_key }.compact.to_json
             { "X-Shopify-Authenticated-Tokens" => tokens }
@@ -104,7 +115,7 @@ module Script
         private_constant(:PartnersProxyAPI)
 
         def script_service_request(query_name:, variables: nil, **options)
-          resp = if ENV["BYPASS_PARTNERS_PROXY"]
+          resp = if bypass_partners_proxy
             ScriptServiceAPI.query(ctx, query_name, variables: variables, **options)
           else
             proxy_through_partners(query_name: query_name, variables: variables, **options)
@@ -113,6 +124,10 @@ module Script
           resp
         end
 
+        def bypass_partners_proxy
+          !ENV["BYPASS_PARTNERS_PROXY"].nil?
+        end
+
         def proxy_through_partners(query_name:, variables: nil, **options)
           options[:variables] = variables.to_json if variables
           resp = PartnersProxyAPI.query(ctx, query_name, **options)

data/lib/project_types/theme/cli.rb

@@ -6,6 +6,7 @@ module Theme
   end
 
   class Command < ShopifyCli::ProjectCommands
+    subcommand :Init, "init", Project.project_filepath("commands/init")
     subcommand :Serve, "serve", Project.project_filepath("commands/serve")
     subcommand :Pull, "pull", Project.project_filepath("commands/pull")
     subcommand :Push, "push", Project.project_filepath("commands/push")

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Theme
+  class Command
+    class Init < ShopifyCli::SubCommand
+      options do |parser, flags|
+        parser.on("-u", "--clone-url URL") { |url| flags[:clone_url] = url }
+      end
+
+      DEFAULT_CLONE_URL = "https://github.com/Shopify/dawn.git"
+
+      def call(args, _name)
+        name = args.first || ask_name
+        clone_url = options.flags[:clone_url] || DEFAULT_CLONE_URL
+        clone(clone_url, name)
+      end
+
+      def self.help
+        ShopifyCli::Context.message("theme.init.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+      end
+
+      private
+
+      def ask_name
+        CLI::UI::Prompt.ask(@ctx.message("theme.init.ask_name"))
+      end
+
+      def clone(url, name)
+        ShopifyCli::Git.clone(url, name)
+
+        @ctx.root = File.join(@ctx.root, name)
+
+        begin
+          @ctx.rm_r(".git")
+          @ctx.rm_r(".github")
+        rescue Errno::ENOENT => e
+          @ctx.debug(e)
+        end
+      end
+    end
+  end
+end

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

@@ -10,7 +10,9 @@ module Theme
 
       def call(*)
         flags = options.flags.dup
-        ShopifyCli::Theme::DevServer.start(@ctx, ".", **flags)
+        ShopifyCli::Theme::DevServer.start(@ctx, ".", **flags) do |syncer|
+          UI::SyncProgressBar.new(syncer).progress(:upload_theme!, delay_low_priority_files: true)
+        end
       end
 
       def self.help

data/lib/project_types/theme/forms/select.rb

@@ -43,7 +43,7 @@ module Theme
         when "development"
           "blue"
         else
-          "grey"
+          "italic"
         end
 
         tags = ["{{#{color}:[#{theme.role}]}}"]

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

@@ -8,6 +8,17 @@ module Theme
             Usage: {{command:%1$s theme [ %2$s ]}}
         HELP
 
+        init: {
+          help: <<~HELP,
+            {{command:%s theme init}}: Clones a Git repository to use as a starting point for building a new theme.
+
+              Usage: {{command:%s theme init [ NAME ]}}
+
+              Options:
+                {{command:-u, --clone-url=URL}} The Git URL to clone from. Defaults to Shopify's example theme, Dawn: https://github.com/Shopify/dawn.git
+          HELP
+          ask_name: "Theme name",
+        },
         publish: {
           confirmation: "This will change your live theme. Do you want to continue?",
           deploying: "Deploying theme",
@@ -79,7 +90,7 @@ module Theme
             Uploads the current theme as a development theme to the connected store, then prints theme editor and preview URLs to your terminal. While running, changes will push to the store in real time.
             Usage: {{command:%s theme serve}}
           HELP
-          serve: "Viewing theme...",
+          serve: "Viewing theme…",
           open_fail: "Couldn't open the theme",
         },
         check: {
@@ -123,9 +134,9 @@ module Theme
         },
         language_server: {
           help: <<~HELP,
-            {{command:%s theme language-server}}: Start a Language Server Protocol server.
+            {{command:%1$s theme language-server}}: Start a Language Server Protocol server.
 
-            Usage: {{command:%s theme language-server}}
+            Usage: {{command:%1$s theme language-server}}
           HELP
         },
         pull: {

data/lib/shopify-cli/admin_api.rb

@@ -134,8 +134,12 @@ module ShopifyCli
         )
         CLI::Kit::Util.begin do
           versions = client.query("api_versions")["data"]["publicApiVersions"]
-          latest = versions.find { |version| version["displayName"].include?("Latest") }
-          latest["handle"]
+          # return the most recent supported version
+          versions
+            .select { |version| version["supported"] }
+            .map { |version| version["handle"] }
+            .sort
+            .reverse[0]
         end.retry_after(API::APIRequestUnauthorizedError, retries: 1) do
           ShopifyCli::IdentityAuth.new(ctx: ctx).reauthenticate
         end

data/lib/shopify-cli/api.rb

@@ -81,7 +81,7 @@ module ShopifyCli
         else
           raise APIRequestUnexpectedError.new("#{response.code}\n#{response.body}", response: response)
         end
-      rescue Net::OpenTimeout, Net::ReadTimeout, Net::WriteTimeout, Errno::ETIMEDOUT, Timeout::Error
+      rescue Errno::ETIMEDOUT, Timeout::Error
         raise APIRequestTimeoutError.new("Timeout")
       end.retry_after(APIRequestRetriableError, retries: 3) do |e|
         sleep(1) if e.is_a?(APIRequestThrottledError)
@@ -108,7 +108,7 @@ module ShopifyCli
       {
         "User-Agent" => "Shopify CLI; v=#{ShopifyCli::VERSION}",
         "Sec-CH-UA" => "Shopify CLI; v=#{ShopifyCli::VERSION} sha=#{ShopifyCli.sha}",
-        "Sec-CH-UA-PLATFORM" => ctx.os,
+        "Sec-CH-UA-PLATFORM" => ctx.os.to_s,
       }.tap do |headers|
         headers["X-Shopify-Cli-Employee"] = "1" if Shopifolk.acting_as_shopify_organization?
       end.merge(auth_headers(token))

data/lib/shopify-cli/context.rb

@@ -327,7 +327,7 @@ module ShopifyCli
         if linux? && which("xdg-open")
           system("xdg-open", uri.to_s)
         elsif windows?
-          system("start", uri.to_s)
+          system("start \"\" \"#{uri}\"")
         elsif mac?
           system("open", uri.to_s)
         else

data/lib/shopify-cli/core/monorail.rb

@@ -46,7 +46,7 @@ module ShopifyCli
 
         # we only want to send Monorail events in production or when explicitly developing
         def enabled?
-          Context.new.system? || ENV["MONORAIL_REAL_EVENTS"] == "1"
+          (Context.new.system? || ENV["MONORAIL_REAL_EVENTS"] == "1") && !Context.new.ci?
         end
 
         def consented?
@@ -54,6 +54,7 @@ module ShopifyCli
         end
 
         def prompt_for_consent
+          return if Context.new.ci?
           return unless enabled?
           return if ShopifyCli::Config.get_section("analytics").key?("enabled")
           msg = Context.message("core.monorail.consent_prompt")
@@ -90,7 +91,7 @@ module ShopifyCli
           {
             schema_id: INVOCATIONS_SCHEMA,
             payload: {
-              project_type: Project.current_project_type.to_s,
+              project_type: project_type_from_dir_or_cmd(commands[0]).to_s,
               command: commands.join(" "),
               args: args.join(" "),
               time_start: start_time,
@@ -104,7 +105,7 @@ module ShopifyCli
               is_employee: ShopifyCli::Shopifolk.acting_as_shopify_organization?,
             }.tap do |payload|
               payload[:api_key] = metadata.delete(:api_key)
-              payload[:partner_id] = metadata.delete(:organization_id)
+              payload[:partner_id] = metadata.delete(:organization_id) || ShopifyCli::DB.get(:organization_id)
               if Project.has_current?
                 project = Project.current(force_reload: true)
                 payload[:api_key] = project.env&.api_key
@@ -114,6 +115,10 @@ module ShopifyCli
             end,
           }
         end
+
+        def project_type_from_dir_or_cmd(command)
+          Project.current_project_type || (command unless ShopifyCli::Commands.core_command?(command)) || nil
+        end
       end
     end
   end

data/lib/shopify-cli/http_request.rb

@@ -1,4 +1,5 @@
 require "net/http"
+require "openssl"
 
 module ShopifyCli
   class HttpRequest
@@ -24,8 +25,13 @@ module ShopifyCli
       end
 
       def request(uri, body, headers, req)
+        cert_store = OpenSSL::X509::Store.new
+        cert_store.set_default_paths
+
         http = ::Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
+        http.cert_store = cert_store
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE if ENV["SSL_VERIFY_NONE"]
 
         req.body = body unless body.nil?
         req["Content-Type"] = "application/json"

data/lib/shopify-cli/messages/messages.rb

@@ -28,7 +28,7 @@ module ShopifyCli
         },
 
         env_file: {
-          saving_header: "writing %s file...",
+          saving_header: "writing %s file…",
           saving: "writing %s file",
           saved: "%s saved to project root",
         },
@@ -69,7 +69,7 @@ module ShopifyCli
             no_commits_made: "No git commits have been made. Please make at least one commit.",
           },
 
-          cloning: "Cloning %s into %s...",
+          cloning: "Cloning %s into %s…",
           cloned: "{{v}} Cloned into %s",
         },
 
@@ -103,9 +103,9 @@ module ShopifyCli
             install_error: "An error occurred while installing dependencies",
           },
 
-          installing: "Installing dependencies with %s...",
+          installing: "Installing dependencies with %s…",
           installed: "Dependencies installed",
-          npm_installing_deps: "Installing %d dependencies...",
+          npm_installing_deps: "Installing %d dependencies…",
           npm_installed_deps: "%d npm dependencies installed",
         },
 
@@ -257,7 +257,7 @@ module ShopifyCli
             count_help: "Number of resources to generate",
           },
 
-          populating: "Populating %d %ss...",
+          populating: "Populating %d %ss…",
 
           completion_message: <<~COMPLETION_MESSAGE,
             Successfully added %d %s to {{green:%s}}
@@ -345,7 +345,7 @@ module ShopifyCli
           confirm_store: {
             prompt: "You are currently logged into {{green:%s}}. Do you want to proceed using this store?",
             confirmation: "Proceeding using {{green:%s}}",
-            cancelling: "Cancelling ...",
+            cancelling: "Cancelling…",
           },
           ensure_env: {
             organization_select: "To which partner organization does this project belong?",
@@ -414,7 +414,9 @@ module ShopifyCli
               "please make sure %s exists within %s before trying again",
           },
 
+          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
@@ -423,9 +425,8 @@ module ShopifyCli
           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 ...",
+          timed_out: "{{x}} ngrok tunnel has timed out, restarting…",
           will_timeout: "{{*}} This tunnel will timeout in {{red:%s}}",
-          prereq_command_location: "%s @ %s",
         },
 
         version: {

data/lib/shopify-cli/packager.rb

@@ -16,7 +16,7 @@ module ShopifyCli
 
       puts "\nBuilding Debian package"
 
-      puts "Generating metadata files..."
+      puts "Generating metadata files…"
       Dir.glob("#{debian_dir}/*").each { |file| File.delete(file) }
 
       metadata_files = %w(control preinst prerm)
@@ -28,7 +28,7 @@ module ShopifyCli
         File.open(file_path, "w", 0775) { |f| f.write(file_contents) }
       end
 
-      puts "Building package..."
+      puts "Building package…"
       Dir.chdir(root_dir)
       raise "Failed to build package" unless system("dpkg-deb", "-b", "shopify-cli")
 
@@ -49,14 +49,14 @@ module ShopifyCli
       spec_path = File.join(root_dir, "shopify-cli.spec")
       puts "\nBuilding RPM package"
 
-      puts "Generating spec file..."
+      puts "Generating spec file…"
       File.delete(spec_path) if File.exist?(spec_path)
 
       spec_contents = File.read(File.join(root_dir, "shopify-cli.spec.base"))
       spec_contents = spec_contents.gsub("SHOPIFY_CLI_VERSION", ShopifyCli::VERSION)
       File.write(spec_path, spec_contents)
 
-      puts "Building package..."
+      puts "Building package…"
       Dir.chdir(root_dir)
       system("rpmbuild", "-bb", File.basename(spec_path))
 
@@ -72,7 +72,7 @@ module ShopifyCli
       build_path = File.join(BUILDS_DIR, "shopify-cli.rb")
       puts "\nBuilding Homebrew package"
 
-      puts "Generating formula..."
+      puts "Generating formula…"
       File.delete(build_path) if File.exist?(build_path)
 
       spec_contents = File.read(File.join(root_dir, "shopify-cli.base.rb"))

data/lib/shopify-cli/theme/dev_server.rb

@@ -20,7 +20,7 @@ module ShopifyCli
       class << self
         attr_accessor :ctx
 
-        def start(ctx, root, port: 9292, silent: false)
+        def start(ctx, root, port: 9292)
           @ctx = ctx
           theme = DevelopmentTheme.new(ctx, root: root)
           ignore_filter = IgnoreFilter.from_path(root)
@@ -43,10 +43,10 @@ module ShopifyCli
           CLI::UI::Frame.open(@ctx.message("theme.serve.serve")) do
             ctx.print_task("Syncing theme ##{theme.id} on #{theme.shop}")
             @syncer.start_threads
-            if silent
-              @syncer.upload_theme!(delay_low_priority_files: true)
+            if block_given?
+              yield @syncer
             else
-              @syncer.upload_theme_with_progress_bar!(delay_low_priority_files: true)
+              @syncer.upload_theme!(delay_low_priority_files: true)
             end
 
             return if stopped
@@ -87,7 +87,7 @@ module ShopifyCli
         end
 
         def stop
-          @ctx.puts("Stopping ...")
+          @ctx.puts("Stopping…")
           @app.close
           @syncer.shutdown
           WebServer.shutdown

data/lib/shopify-cli/theme/dev_server/local_assets.rb

@@ -72,7 +72,7 @@ module ShopifyCli
         def replace_asset_urls(body)
           replaced_body = body.join.gsub(ASSET_REGEX) do |match|
             path = Pathname.new(Regexp.last_match[1])
-            if @theme.asset_paths.include?(path)
+            if @theme.static_asset_paths.include?(path)
               "/#{path}"
             else
               match