shopify-cli 2.20.0 → 2.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fb2bcf8db165a28ff5753227eb1aae9d2d83e65e8a2cee8a8a2ed4e7f8d7d4b
-  data.tar.gz: 5ab1e805308119941d84932997959926011281ea4a2b48d5517ca43c3794661c
+  metadata.gz: 2bab2227e665dd4dec8e90ca261705072971a838f85d19bcbb85d18ed1a1d5b0
+  data.tar.gz: 90e22472586a681a26974882b79ac3fd326fdcf696db2aa29201ab5d9a37c2b0
 SHA512:
-  metadata.gz: a6c2ba75cadbc318cae8615890386c1c3aa8100405d12e070627470448d367daf96a65390e6afad6b6d70ae8bdbc7e27f8d7dbdccf5b69e4fde12f6bca681b94
-  data.tar.gz: 66699ed47aa46b23f3dfe4dba39a9e15c23e135db254a22db2e4800d0865be49b23bca70eb9733a497bd2a87a2e8aa6db00e887da53a4f83881f719983eda906
+  metadata.gz: 24701865a98be1b3062ff7644fff3d35b61532803e96c39d84c7fae636b8205531e57e41641d1222dbd09275288e4dee2f2f94c837d58846212a0f4ed1643b28
+  data.tar.gz: 6e5c53ef75f07879d338692ce9271749002c13f8174a19fe3857b3396ec1512a2368770ec50bd24de2a0c9dc325dddb5b3547564c79cc360a40d1b19b35d2c50

data/.github/workflows/cla.yml

@@ -0,0 +1,22 @@
+name: Contributor License Agreement (CLA)
+
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+  issue_comment:
+    types: [created]
+
+jobs:
+  cla:
+    runs-on: ubuntu-latest
+    if: |
+      (github.event.issue.pull_request 
+        && !github.event.issue.pull_request.merged_at
+        && contains(github.event.comment.body, 'signed')
+      ) 
+      || (github.event.pull_request && !github.event.pull_request.merged)
+    steps:
+      - uses: Shopify/shopify-cla-action@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cla-token: ${{ secrets.CLA_TOKEN }}

data/CHANGELOG.md

@@ -2,6 +2,13 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.20.1 - 2022-07-18
+
+### Fixed
+* [#2458](https://github.com/Shopify/shopify-cli/pull/2458): Fix shop URL in unauthorized error message
+* [#2459](https://github.com/Shopify/shopify-cli/pull/2459): Fix `.json` file ignore issues with `shopify theme push`
+* [#2460](https://github.com/Shopify/shopify-cli/pull/2460): Fix job retries for .json theme file dependencies and support wider range of asset API errors
+
 ## Version 2.20.0 - 2022-07-11
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.20.0)
+    shopify-cli (2.20.1)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.10.3)

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

@@ -11,7 +11,7 @@ module Theme
         unauthorized_error: <<~EOD,
           You can't use Shopify CLI with development stores if you only have Partner staff member access. If you want to use Shopify CLI to work on a development store, then you should be the store owner or create a staff account on the store.
 
-          If you're the store owner, then you need to log in to the store directly using the store URL at least once (for example, using %s.myshopify.com/admin) before you log in using Shopify CLI. Logging in to the Shopify admin directly connects the development store with your Shopify login.
+          If you're the store owner, then you need to log in to the store directly using the store URL at least once (for example, using %s/admin) before you log in using Shopify CLI. Logging in to the Shopify admin directly connects the development store with your Shopify login.
         EOD
         ensure_user_try_this: <<~ENSURE_USER,
           Check if your user is activated, has permission to edit themes at the store, and try to re-login.

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

@@ -10,7 +10,7 @@ module ShopifyCLI
         def enqueue_json_updates(files)
           # Update remote JSON files and delays `delayed_files` update
           files = files
-            .select { |file| !ignore_file?(file) && file.exist? && checksums.file_has_changed?(file) }
+            .select { |file| ready_to_update?(file) }
             .sort_by { |file| delayed_files.include?(file) ? 1 : 0 }
             .reject { |file| overwrite_json? && delayed_files.include?(file) }
 
@@ -26,7 +26,7 @@ module ShopifyCLI
           return unless overwrite_json?
           # Update delayed files synchronously
           delayed_files.each do |file|
-            update(file) if checksums.file_has_changed?(file)
+            update(file) if ready_to_update?(file)
           end
         end
 
@@ -86,6 +86,10 @@ module ShopifyCLI
         def ask_update_strategy(file)
           Forms::SelectUpdateStrategy.ask(@ctx, [], file: file, exists_remotely: file_exist_remotely?(file)).strategy
         end
+
+        def ready_to_update?(file)
+          !ignore_file?(file) && file.exist? && checksums.file_has_changed?(file)
+        end
       end
     end
   end

data/lib/shopify_cli/theme/syncer.rb

@@ -366,17 +366,23 @@ module ShopifyCLI
         checksums.reject_duplicated_checksums!
       end
 
-      def parse_api_errors(exception)
+      def parse_api_errors(operation, exception)
         parsed_body = if exception&.response&.is_a?(Hash)
           exception&.response&.[](:body)
         else
           JSON.parse(exception&.response&.body)
         end
-        message = parsed_body.dig("errors", "asset") || parsed_body["message"] || exception.message
+
+        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
+        ["The asset #{operation.file} is could not be synced (cause: #{e.message})."]
       end
 
       def backoff_if_near_limit!(used, limit)
@@ -400,7 +406,7 @@ module ShopifyCLI
       end
 
       def handle_operation_error(operation, error)
-        error_suffix = ":\n  " + parse_api_errors(error).join("\n  ")
+        error_suffix = ":\n  " + parse_api_errors(operation, error).join("\n  ")
         report_error(operation, error_suffix)
       end
 

data/lib/shopify_cli/theme/theme_admin_api_throttler/bulk_job.rb

@@ -10,7 +10,7 @@ module ShopifyCLI
     class ThemeAdminAPIThrottler
       class BulkJob < ShopifyCLI::ThreadPool::Job
         JOB_TIMEOUT = 0.2 # 200ms
-        MAX_RETRIES = 5
+        MAX_RETRIES = 10
 
         attr_reader :bulk
 

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.20.0"
+  VERSION = "2.20.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.20.0
+  version: 2.20.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,7 +124,7 @@ files:
 - ".github/ISSUE_TEMPLATE/enhancement.yaml"
 - ".github/ISSUE_TEMPLATE/feature.yaml"
 - ".github/PULL_REQUEST_TEMPLATE.md"
-- ".github/probots.yml"
+- ".github/workflows/cla.yml"
 - ".github/workflows/shopify.yml"
 - ".github/workflows/stale.yml"
 - ".github/workflows/triage.yml"

data/.github/probots.yml

@@ -1,3 +0,0 @@
-# .github/probots.yml
-enabled:
-  - cla