shopify-cli 2.0.1 → 2.2.1

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

@@ -90,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: {
@@ -134,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/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/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

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

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

@@ -20,9 +20,9 @@ module ShopifyCli
         path.read
       end
 
-      def write(content)
+      def write(*args)
         path.parent.mkpath unless path.parent.directory?
-        path.write(content)
+        path.write(*args)
       end
 
       def delete

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

@@ -149,7 +149,7 @@ module ShopifyCli
         # Process lower-priority files in the background
 
         # Assets are served locally, so can be uploaded in the background
-        enqueue_updates(@theme.asset_files)
+        enqueue_updates(@theme.static_asset_files)
 
         unless delay_low_priority_files
           wait!(&block)
@@ -254,8 +254,12 @@ module ShopifyCli
 
         update_checksums(body)
 
-        value = body.dig("asset", "value") || Base64.decode64(body.dig("asset", "attachment"))
-        file.write(value)
+        attachment = body.dig("asset", "attachment")
+        value = if attachment
+          file.write(Base64.decode64(attachment), 0, mode: "wb")
+        else
+          file.write(body.dig("asset", "value"))
+        end
 
         response
       end
@@ -277,7 +281,7 @@ module ShopifyCli
 
       def update_checksums(api_response)
         api_response.values.flatten.each do |asset|
-          if asset["key"] && asset["checksum"]
+          if asset["key"]
             @checksums[asset["key"]] = asset["checksum"]
           end
         end
@@ -310,7 +314,7 @@ module ShopifyCli
 
       def backoff_if_near_limit!(used, limit)
         if used > limit - @threads.size
-          @ctx.debug("Near API call limit, waiting 2 sec ...")
+          @ctx.debug("Near API call limit, waiting 2 sec…")
           @backoff_mutex.synchronize { sleep 2 }
         end
       end

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

@@ -20,11 +20,11 @@ module ShopifyCli
       end
 
       def theme_files
-        glob(["**/*.liquid", "**/*.json", "assets/*"])
+        glob(["**/*.liquid", "**/*.json", "assets/*"]).uniq
       end
 
-      def asset_files
-        glob("assets/*")
+      def static_asset_files
+        glob("assets/*").reject(&:liquid?)
       end
 
       def liquid_files
@@ -43,8 +43,8 @@ module ShopifyCli
         theme_files.include?(self[file])
       end
 
-      def asset_paths
-        asset_files.map(&:relative_path)
+      def static_asset_paths
+        static_asset_files.map(&:relative_path)
       end
 
       def [](file)

data/lib/shopify-cli/tunnel.rb

@@ -149,7 +149,7 @@ module ShopifyCli
       check_prereq_command(ctx, "curl")
       check_prereq_command(ctx, ctx.linux? ? "unzip" : "tar")
       spinner = CLI::UI::SpinGroup.new
-      spinner.add("Installing ngrok...") do
+      spinner.add(ctx.message("core.tunnel.installing")) do
         zip_dest = File.join(ShopifyCli.cache_dir, "ngrok.zip")
         unless File.exist?(zip_dest)
           ctx.system("curl", "-o", zip_dest, DOWNLOAD_URLS[ctx.os], chdir: ShopifyCli.cache_dir)

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = "2.0.1"
+  VERSION = "2.2.1"
 end

data/shopify-cli.gemspec

@@ -44,5 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency("minitest", "~> 5.0")
 
   spec.add_dependency("listen", "~> 3.5")
-  spec.add_dependency("theme-check", "~> 1.0")
+  spec.add_dependency("theme-check", "~> 1.1")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.2.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-29 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 description: |
   Shopify CLI helps you build Shopify apps faster. It quickly scaffolds Node.js
   and Ruby on Rails embedded apps. It also automates many common tasks in the
@@ -121,6 +121,7 @@ files:
 - RELEASING.md
 - Rakefile
 - SECURITY.md
+- THEMEKIT_MIGRATION.md
 - bin/load_shopify.rb
 - bin/shopify
 - dev.yml
@@ -158,9 +159,11 @@ files:
 - lib/graphql/find_organization.graphql
 - lib/graphql/get_app_by_api_key.graphql
 - lib/graphql/get_app_urls.graphql
+- lib/graphql/get_variant_id.graphql
 - lib/graphql/update_dashboard_urls.graphql
 - lib/project_types/extension/cli.rb
 - lib/project_types/extension/commands/build.rb
+- lib/project_types/extension/commands/check.rb
 - lib/project_types/extension/commands/connect.rb
 - lib/project_types/extension/commands/create.rb
 - lib/project_types/extension/commands/extension_command.rb
@@ -180,6 +183,10 @@ files:
 - lib/project_types/extension/features/argo_setup.rb
 - lib/project_types/extension/features/argo_setup_step.rb
 - lib/project_types/extension/features/argo_setup_steps.rb
+- lib/project_types/extension/features/runtimes/admin.rb
+- lib/project_types/extension/features/runtimes/base.rb
+- lib/project_types/extension/features/runtimes/checkout_post_purchase.rb
+- lib/project_types/extension/features/runtimes/checkout_ui_extension.rb
 - lib/project_types/extension/forms/connect.rb
 - lib/project_types/extension/forms/create.rb
 - lib/project_types/extension/forms/questions/ask_app.rb
@@ -191,6 +198,7 @@ files:
 - lib/project_types/extension/models/app.rb
 - lib/project_types/extension/models/lazy_specification_handler.rb
 - lib/project_types/extension/models/npm_package.rb
+- lib/project_types/extension/models/product.rb
 - lib/project_types/extension/models/registration.rb
 - lib/project_types/extension/models/specification.rb
 - lib/project_types/extension/models/specification_handlers/checkout_post_purchase.rb
@@ -204,6 +212,7 @@ files:
 - lib/project_types/extension/tasks/configure_features.rb
 - lib/project_types/extension/tasks/configure_options.rb
 - lib/project_types/extension/tasks/converters/app_converter.rb
+- lib/project_types/extension/tasks/converters/product_converter.rb
 - lib/project_types/extension/tasks/converters/registration_converter.rb
 - lib/project_types/extension/tasks/converters/validation_error_converter.rb
 - lib/project_types/extension/tasks/converters/version_converter.rb
@@ -213,6 +222,7 @@ files:
 - lib/project_types/extension/tasks/get_app.rb
 - lib/project_types/extension/tasks/get_apps.rb
 - lib/project_types/extension/tasks/get_extensions.rb
+- lib/project_types/extension/tasks/get_product.rb
 - lib/project_types/extension/tasks/update_draft.rb
 - lib/project_types/extension/tasks/user_errors.rb
 - lib/project_types/node/cli.rb