shopify-cli 2.6.4 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51b5808e81e2d168620af088bec6f155869a9870b516960927735f9b7b886e55
-  data.tar.gz: 47c04e0dbabd30bb2c03e8c99771e724e16fe7c336fd342be01540749088bee5
+  metadata.gz: 8e55157b78cbbd9cd86e3d2e8c542241d7064de3fc4e37768f207dc8ee124f4c
+  data.tar.gz: 7b5aa9ae10f96a7724d4a0b0dd79712254ce3f99273a88c7e9198ec03f17ba7c
 SHA512:
-  metadata.gz: d75f831a6214930264f60c6c5699beddba9ae73c834878723b2b6c764a5e98d30e427183fa6946fdf57c45a90859cc0a4bbd5420616a72b2f340c0c91093a430
-  data.tar.gz: b73c3d43b0a711994930c0490de71bfeeeff0775b5e0ce6efc48c8c40935b630e5d0ed7182d6eb20188357199a469325b7b40f6cbf317dccb34655745e315ef6
+  metadata.gz: b526446476543316cdd68a40cc5e28af1a0bd0d823757b53901c39b9e2f510a8fb9e9edd52f7fc967df44603d17d9092e95b375e12618f86f6261f45217b4802
+  data.tar.gz: 7ee68c03b039974c59d0cbc50ad866faf52ec436fe66b17c1a79e801c4ed1854ddf13fb82274e79e2917c5d63c0066b048d1255d4a3019349dd559b402d12cd8

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 From version 2.6.0, the sections in this file adhere to the [keep a changelog](https://keepachangelog.com/en/1.0.0/) specification.
 ## [Unreleased]
 
+## Version 2.6.5
+### Fixed
+* [#1661](https://github.com/Shopify/shopify-cli/pull/1661): Handle npm list non-zero exit status when pushing scripts
 ## Version 2.6.4
 ### Fixed
 * [#1633](https://github.com/Shopify/shopify-cli/pull/1633): Runtime error when the shop passed on login is invalid

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.6.4)
+    shopify-cli (2.6.5)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.7.2)

data/lib/project_types/script/layers/infrastructure/languages/assemblyscript_task_runner.rb

@@ -49,12 +49,31 @@ module Script
 
           def library_version(library_name)
             output = JSON.parse(CommandRunner.new(ctx: ctx).call("npm list --json"))
-            raise Errors::APILibraryNotFoundError.new(library_name), output unless output["dependencies"][library_name]
-            output["dependencies"][library_name]["version"]
+            library_version_from_npm_list(output, library_name)
+          rescue Errors::SystemCallFailureError => error
+            library_version_from_npm_list_error_output(error, library_name)
           end
 
           private
 
+          def library_version_from_npm_list_error_output(error, library_name)
+            # npm list can return a failure status code, even when returning the correct data.
+            # This causes the CommandRunner to throw a SystemCallFailure error that contains the data.
+            # In here, we check that the output contains `npm list`'s structure and extract the version.
+            output = JSON.parse(error.out)
+            raise error unless output.key?("dependencies")
+
+            library_version_from_npm_list(output, library_name)
+          rescue JSON::ParserError
+            raise error
+          end
+
+          def library_version_from_npm_list(output, library_name)
+            output.dig("dependencies", library_name, "version").tap do |version|
+              raise Errors::APILibraryNotFoundError, library_name unless version
+            end
+          end
+
           def check_node_version!
             output, status = @ctx.capture2e("node", "--version")
             raise Errors::DependencyInstallError, output unless status.success?

data/lib/project_types/script/messages/messages.rb

@@ -212,10 +212,6 @@ module Script
           built: "Built",
           pushing: "Pushing",
           pushed: "Pushed",
-          disabling: "Disabling",
-          disabled: "Disabled",
-          enabling: "Enabling",
-          enabled: "Enabled",
           ensure_env: {
             organization: "Partner organization {{green:%s (%s)}}.",
             organization_select: "Which partner organization do you want to use?",

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.6.4"
+  VERSION = "2.6.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.6.5
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler