shopify-cli 2.32.0 → 2.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1f827e0b1d481a8fdd6e7160ef85d6e63bee0a7607f6bf148693956f901d67c
-  data.tar.gz: 5882878a69100c7ac97255c80a0ca868ca616be1eca5a523c3e1ddf1e8896dc4
+  metadata.gz: ac3c8680848c4b1caae004aba8327a321aded59a73e9454130534726a16a5a4d
+  data.tar.gz: 46bc06119d1fce33ebef93562bcbe904c5938502d9394b8748000b0ff260671a
 SHA512:
-  metadata.gz: 5f2335aecb476e962d7283d33187acb94cae34a1b6b23f52f48ad890c4daaeeabf0afeaecb0a3740a57ac98c86a18a7f35422430da2eea5413472fc85c740360
-  data.tar.gz: 6e9b70d65c59e9531b44e270d752637999bccaaf844c7f89be659c04f3f6f343bd89ce72e1e25c46d0d16dc66873233a5268aba8aab2eed873e0a086a7af0b6a
+  metadata.gz: 51da54fda07bd8d66d0aa4e8aedd54df04c23fc50fff79e520179f5e956f4eb940c961e933794f59187b92171fb9998393666dd58986219887a003f848341e78
+  data.tar.gz: 35a4a6bda609ff6775880f80e9b31171e9edbeef0bbc9745bd5b17b47c6e9d428e4b0a146f075642e229e0cc224e3202b9f5bfed170650b91b1fe7ebb5c30725

data/CHANGELOG.md

@@ -2,6 +2,17 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.33.0 - 2022-12-19
+
+### Added
+* [#2681](https://github.com/Shopify/shopify-cli/pull/2681): Enable Theme Access passwords for theme serve
+* [#2701](https://github.com/Shopify/shopify-cli/pull/2701): Update theme-check to 1.12.1 (introduce intelligent code completion)
+
+## Version 2.32.1 - 2022-12-05
+
+### Fixed
+* [#2694](https://github.com/Shopify/shopify-cli/pull/2694): Add sunset warnings
+
 ## Version 2.32.0 - 2022-11-14
 
 ### Added
@@ -9,6 +20,7 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ### Fixed
 * [#2683](https://github.com/Shopify/shopify-cli/pull/2683): Fix timeout issue with the `shopify theme push` command and the `--json` flag
+* [#2688](https://github.com/Shopify/shopify-cli/pull/2688): Fix `shopify theme push` to report pushes with errors
 
 ## Version 2.31.0 - 2022-11-07
 

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.32.0)
+    shopify-cli (2.33.0)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
-      theme-check (~> 1.11.0)
+      theme-check (~> 1.12.1)
 
 GEM
   remote: https://rubygems.org/
@@ -101,14 +101,14 @@ GEM
     mocha (1.13.0)
     multi_test (0.1.2)
     multipart-post (2.1.1)
-    nokogiri (1.13.9)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     octokit (4.22.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.21.0)
-    parser (3.1.2.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -117,7 +117,7 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     public_suffix (4.0.6)
-    racc (1.6.0)
+    racc (1.6.1)
     rack (2.2.3.1)
     rainbow (3.1.1)
     rake (13.0.6)
@@ -150,7 +150,7 @@ GEM
       faraday (> 0.8, < 2.0)
     sys-uname (1.2.2)
       ffi (~> 1.1)
-    theme-check (1.11.0)
+    theme-check (1.12.1)
       liquid (>= 5.4.0)
       nokogiri (>= 1.12)
       parser (~> 3)

data/README.md

@@ -11,17 +11,11 @@
   <img src="https://img.shields.io/badge/License-MIT-green.svg" alt="License">
   <img src="https://img.shields.io/badge/Powered%20by-Ruby-red" alt="Powered by Ruby">
 
-
 Shopify CLI 2.0 is a command line to help you build on Shopify. It's available as a Ruby gem and can be run and installed on Mac, Linux, and Windows systems.
 
-## Note on Shopify CLI 2.0 versus Shopify CLI 3.0 ##
-
-Use 2.0 for developing themes. For developing apps and custom storefronts, we recommend using [Shopify CLI 3.0](https://github.com/Shopify/cli).
-
-
-## Installation 
+## CLI Deprecation & Sunset
 
-Check out our [installation steps](docs/users/installation.md).
+Note that Shopify 2.0 is deprecated and will be [sunset on May 31, 2023](https://shopify.dev/changelog/cli-2-0-to-be-sunset-on-may-31-2023). We encourage using [Shopify CLI 3.0](https://github.com/Shopify/cli) to develop apps, custom storefronts, and themes. 
 
 ## Contributing 👩‍💻
 

data/lib/shopify_cli/core/entry_point.rb

@@ -5,28 +5,7 @@ module ShopifyCLI
     module EntryPoint
       class << self
         def call(args, ctx = Context.new)
-          # Only instruct the user to update the CLI, or warn them that they're
-          # using CLI2 not CLI3, if they're running CLI2 directly. Otherwise the
-          # warnings will be confusing and/or incorrect.
-          unless Environment.run_as_subprocess?
-            if ctx.development? && !ctx.testing?
-              ctx.warn(
-                ctx.message(
-                  "core.warning.development_version",
-                  File.join(ShopifyCLI::ROOT, "bin", ShopifyCLI::TOOL_NAME)
-                )
-              )
-              # because `!ctx.new_version.nil?` will change the config by calling ::Config.set
-              # it's important to keep the checks in this order so that we don't trigger it while testing
-              # since changing the config will throw errors
-            elsif !ctx.testing? && !ctx.new_version.nil?
-              ctx.warn(ctx.message("core.warning.new_version", ShopifyCLI::VERSION, ctx.new_version))
-            end
-
-            if ShopifyCLI::Core::CliVersion.using_3_0?
-              ctx.warn(ctx.message("core.warning.in_3_0_directory"))
-            end
-          end
+          show_warnings(ctx, args.join(" "))
 
           ProjectType.load_all
 
@@ -38,6 +17,47 @@ module ShopifyCLI
             executor.call(command, command_name, args)
           end
         end
+
+        def show_warnings(ctx, args)
+          # Only instruct the user to update the CLI, or warn them that they're
+          # using CLI2 not CLI3, if they're running CLI2 directly. Otherwise the
+          # warnings will be confusing and/or incorrect.
+          return if Environment.run_as_subprocess?
+
+          show_sunset_warning(ctx, args)
+
+          if ctx.development? && !ctx.testing?
+            ctx.warn(
+              ctx.message(
+                "core.warning.development_version",
+                File.join(ShopifyCLI::ROOT, "bin", ShopifyCLI::TOOL_NAME)
+              )
+            )
+            # because `!ctx.new_version.nil?` will change the config by calling ::Config.set
+            # it's important to keep the checks in this order so that we don't trigger it while testing
+            # since changing the config will throw errors
+          elsif !ctx.testing? && !ctx.new_version.nil?
+            ctx.warn(ctx.message("core.warning.new_version", ShopifyCLI::VERSION, ctx.new_version))
+          end
+
+          if ShopifyCLI::Core::CliVersion.using_3_0?
+            ctx.warn(ctx.message("core.warning.in_3_0_directory"))
+          end
+        end
+
+        def show_sunset_warning(ctx, args)
+          return if ctx.testing?
+
+          if args.start_with?("app create") || args.start_with?("app extension create")
+            ctx.warn(ctx.message("core.warning.sunset_create_app"))
+          elsif args.start_with?("app")
+            ctx.warn(ctx.message("core.warning.sunset_app"))
+          elsif args.start_with?("theme")
+            ctx.warn(ctx.message("core.warning.sunset_theme"))
+          else
+            ctx.warn(ctx.message("core.warning.sunset"))
+          end
+        end
       end
     end
   end

data/lib/shopify_cli/messages/messages.rb

@@ -804,6 +804,22 @@ module ShopifyCLI
               Already have CLI 3.0 installed? Run it using your node package manager, as explained here:
               {{underline:https://shopify.dev/apps/tools/cli/cli-2#running-shopify-cli-2-x-and-3-x-in-the-same-environment}}
           MESSAGE
+
+          sunset: <<~MESSAGE,
+            {{*}} {{yellow:Note that CLI 2.x will be sunset on May 31, 2023.}}
+          MESSAGE
+
+          sunset_create_app: <<~MESSAGE,
+            {{*}} {{yellow:Note that this CLI 2.x command will be sunset on April 28, 2023. Check here for instructions on how to migrate over to CLI 3.x: {{underline:https://shopify.dev/apps/tools/cli/migrate}}.}}
+          MESSAGE
+
+          sunset_app: <<~MESSAGE,
+            {{*}} {{yellow:Note that CLI 2.x will be sunset on May 31, 2023. Check here for instructions on how to migrate over to CLI 3.x: {{underline:https://shopify.dev/apps/tools/cli/migrate}}.}}
+          MESSAGE
+
+          sunset_theme: <<~MESSAGE,
+            {{*}} {{yellow:Note that CLI 2.x will be sunset on May 31, 2023. Check here for instructions on how to migrate over to CLI 3.x: {{underline:https://shopify.dev/themes/tools/cli/migrate}}.}}
+          MESSAGE
         },
         reporting: {
           help: <<~HELP,

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "stringio"
 require "time"
 require "cgi"
@@ -20,6 +21,7 @@ module ShopifyCLI
         "transfer-encoding",
         "upgrade",
         "content-security-policy",
+        "content-length",
       ]
 
       class Proxy
@@ -54,14 +56,14 @@ module ShopifyCLI
               "POST", env["PATH_INFO"],
               headers: headers,
               query: query,
-              form_data: form_data.merge(replace_templates).merge(_method: env["REQUEST_METHOD"]),
+              form_data: form_data.merge(replace_templates).merge(_method: env["REQUEST_METHOD"])
             )
           else
             request(
               env["REQUEST_METHOD"], env["PATH_INFO"],
               headers: headers,
               query: query,
-              body_stream: (env["rack.input"] if has_body?(headers)),
+              body_stream: (env["rack.input"] if has_body?(headers))
             )
           end
 
@@ -97,7 +99,7 @@ module ShopifyCLI
 
         def bearer_token
           Environment.storefront_renderer_auth_token ||
-          ShopifyCLI::DB.get(:storefront_renderer_production_exchange_token) ||
+            ShopifyCLI::DB.get(:storefront_renderer_production_exchange_token) ||
             raise(KeyError, "storefront_renderer_production_exchange_token missing")
         end
 
@@ -152,11 +154,13 @@ module ShopifyCLI
 
         def secure_session_id_expired?
           return true unless @secure_session_id && @last_session_cookie_refresh
+
           Time.now - @last_session_cookie_refresh >= SESSION_COOKIE_MAX_AGE
         end
 
         def extract_secure_session_id_from_response_headers(headers)
           return unless headers["set-cookie"]
+
           headers["set-cookie"][SESSION_COOKIE_REGEXP, 1]
         end
 
@@ -173,7 +177,7 @@ module ShopifyCLI
 
         def get_response_headers(response, env)
           response_headers = normalize_headers(
-            response.respond_to?(:headers) ? response.headers : response.to_hash
+            response.respond_to?(:headers) ? response.headers : response.to_hash,
           )
           # According to https://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-14#section-7.1.3.1Acc
           # should remove hop-by-hop header fields
@@ -196,6 +200,16 @@ module ShopifyCLI
 
         def request(method, path, headers: nil, query: [], form_data: nil, body_stream: nil)
           uri = URI.join("https://#{shop}", path)
+
+          if Environment.theme_access_password?
+            headers = headers ? headers.slice("ACCEPT", "CONTENT-TYPE", "CONTENT-LENGTH", "Cookie") : {}
+            headers.merge!({
+              "X-Shopify-Access-Token" => Environment.admin_auth_token,
+              "X-Shopify-Shop" => shop,
+            })
+            uri = URI.join("https://#{ThemeAccessAPI::BASE_URL}", "cli/sfr#{path}")
+          end
+
           uri.query = URI.encode_www_form(query + [[:_fd, 0], [:pb, 0]])
 
           @ctx.debug("Proxying #{method} #{uri}")

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

@@ -26,13 +26,11 @@ module ShopifyCLI
           :ignore_file?,
           :overwrite_json?,
           :bulk_updates_activated?,
-
           # enqueue
           :enqueue_deletes,
           :enqueue_get,
           :enqueue_union_merges,
           :enqueue_updates,
-
           # checksums
           :checksums,
           :update_checksums,
@@ -112,7 +110,7 @@ module ShopifyCLI
           retries = 0
           pending_items = files.map { |file| bulk_item(file) }
 
-          while pending_items.any? && retries < 4
+          while pending_items.any? && retries < 2
             bulk = Bulk.new(ctx, theme, api_client)
 
             files
@@ -183,7 +181,7 @@ module ShopifyCLI
             [
               theme["config/settings_schema.json"],
               theme["config/settings_data.json"],
-            ]
+            ],
           )
         end
 
@@ -217,8 +215,14 @@ module ShopifyCLI
 
         # Handler errors
 
-        def report(file, _error)
-          error_message = "The asset #{file.relative_path} could not be uploaded.\n#{e.inspect}"
+        def report(file, error)
+          file_path = file.relative_path
+
+          error_message = syncer
+            .parse_api_errors(file, error)
+            .map { |msg| "#{file_path}: #{msg}" }
+            .join("\n")
+
           syncer.report_file_error(file, error_message)
         end
       end

data/lib/shopify_cli/theme/syncer.rb

@@ -121,6 +121,7 @@ module ShopifyCLI
 
       def wait!
         raise ThreadError, "No syncer threads" if @threads.empty?
+
         total = size
         last_size = size
         until empty? || @queue.closed?
@@ -134,7 +135,7 @@ module ShopifyCLI
 
       def fetch_checksums!
         _status, response = api_client.get(
-          path: "themes/#{@theme.id}/assets.json"
+          path: "themes/#{@theme.id}/assets.json",
         )
         update_checksums(response)
       end
@@ -151,6 +152,7 @@ module ShopifyCLI
             loop do
               operation = @queue.pop
               break if operation.nil? # shutdown was called
+
               perform(operation)
             rescue Exception => e # rubocop:disable Lint/RescueException
               error_suffix = ": #{e}"
@@ -195,7 +197,7 @@ module ShopifyCLI
       end
 
       def handle_operation_error(operation, error)
-        error_suffix = ":\n  " + parse_api_errors(operation, error).join("\n  ")
+        error_suffix = ":\n  " + parse_api_errors(operation.file, error).join("\n  ")
         report_error(operation, error_suffix)
       end
 
@@ -206,6 +208,7 @@ module ShopifyCLI
       def update_checksums(api_response)
         api_response.values.flatten.each do |asset|
           next unless asset["key"]
+
           checksums[asset["key"]] = asset["checksum"]
         end
 
@@ -219,6 +222,33 @@ module ShopifyCLI
         @error_reporter.report(error_message)
       end
 
+      def parse_api_errors(file, exception)
+        parsed_body = {}
+
+        if exception.respond_to?(:response)
+          response = exception.response
+
+          parsed_body = if response&.is_a?(Hash)
+            response&.[](:body)
+          else
+            JSON.parse(response&.body)
+          end
+        end
+
+        errors = parsed_body.dig("errors") # either nil or another type
+        errors = errors.dig("asset") if errors&.is_a?(Hash)
+
+        message = errors || parsed_body["message"] || exception.message
+        # Truncate to first lines
+        [message].flatten.map { |m| m.split("\n", 2).first }
+      rescue JSON::ParserError
+        [exception.message]
+      rescue StandardError => e
+        cause = "(cause: #{e.message})"
+        backtrace = e.backtrace.join("\n")
+        ["The asset #{file} could not be synced #{cause} #{backtrace}"]
+      end
+
       private
 
       def report_error(operation, error_suffix = "")
@@ -256,6 +286,7 @@ module ShopifyCLI
 
       def perform(operation)
         return if @queue.closed?
+
         wait_for_backoff!
         @ctx.debug(operation.to_s)
 
@@ -263,7 +294,6 @@ module ShopifyCLI
 
         report_performed_operation(operation)
         backoff_if_near_limit!(response)
-
       rescue StandardError => error
         handle_operation_error(operation, error)
       ensure
@@ -283,7 +313,7 @@ module ShopifyCLI
 
         _status, body, response = api_client.put(
           path: path,
-          body: JSON.generate(asset: asset)
+          body: JSON.generate(asset: asset),
         )
         file.warnings = body.dig("asset", "warnings")
 
@@ -315,7 +345,7 @@ module ShopifyCLI
           path: "themes/#{@theme.id}/assets.json",
           body: JSON.generate(asset: {
             key: file.relative_path,
-          })
+          }),
         )
 
         response
@@ -342,33 +372,6 @@ module ShopifyCLI
         response
       end
 
-      def parse_api_errors(operation, exception)
-        parsed_body = {}
-
-        if exception.respond_to?(:response)
-          response = exception.response
-
-          parsed_body = if response&.is_a?(Hash)
-            response&.[](:body)
-          else
-            JSON.parse(response&.body)
-          end
-        end
-
-        errors = parsed_body.dig("errors") # either nil or another type
-        errors = errors.dig("asset") if errors&.is_a?(Hash)
-
-        message = errors || parsed_body["message"] || exception.message
-        # Truncate to first lines
-        [message].flatten.map { |m| m.split("\n", 2).first }
-      rescue JSON::ParserError
-        [exception.message]
-      rescue StandardError => e
-        cause = "(cause: #{e.message})"
-        backtrace = e.backtrace.join("\n")
-        ["The asset #{operation.file} could not be synced #{cause} #{backtrace}"]
-      end
-
       def theme_created_at_runtime?
         @theme.created_at_runtime?
       end

data/lib/shopify_cli/theme/theme_admin_api.rb

@@ -61,6 +61,7 @@ module ShopifyCLI
         if empty_response?(error)
           return permission_error
         elsif unauthorized_response?(error)
+          @ctx.debug("[#{self.class}] (#{error.class}) cause: #{response_body(error)}")
           raise ShopifyCLI::Abort, @ctx.message("theme.unauthorized_error", @shop)
         end
 

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.32.0"
+  VERSION = "2.33.0"
 end

data/shopify-cli.gemspec

@@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
   # Whereas if we were to have "~> 1.9", that version would still be satisfied and thus not upgraded.
   # Both shopify-cli and theme-check gems are owned and developed by Shopify.
   # These gems are currently being actively developed and it's easiest to update them together.
-  spec.add_dependency("theme-check", "~> 1.11.0")
+  spec.add_dependency("theme-check", "~> 1.12.1")
 
   spec.extensions = ["ext/shopify-extensions/extconf.rb"]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.32.0
+  version: 2.33.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-14 00:00:00.000000000 Z
+date: 2022-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.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