shopify-cli 1.13.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efb6500804d976bce67276002bd2e95343cc080c7278fc7c510017676abb24a0
-  data.tar.gz: 3f0ab9095319fb4743fb37d19db43195c4fd4c737122ceada5958c00bad01b84
+  metadata.gz: 7f924d0de5639f7af794a6b35305b0bdcd78e2fad0f8a4c589006d249f48bbac
+  data.tar.gz: 701e91a9b522933b26f3a26baeab8f900a9cb3aa181e3b847b8a231c9edd5f04
 SHA512:
-  metadata.gz: 27cf1b9e1256bb8732fbc291eb423a26ec1570e79cd960c9cc508e387ca58edeb5559680183f5a94009255b17f970e78ed4e1aee591f2782a29be2b9ab9b79b2
-  data.tar.gz: d6e489fc945ce4f27f3800238ff62b24b23073debfe29e48a196c972f7c7ebb34cea7f0affe7d7d326e48573e6df61c7ff68d062e261e83844fbd72cb0ce29ab
+  metadata.gz: 96191b61830023526627944dcf5c4ac6a6b883aa060f81be3095cf5275763ef1552268cdcf46bc9d9b65cf9960ce879aa12b07cd799f2068f65329143a3149cc
+  data.tar.gz: 7e4d1e6c0c6b60609b661261cb0846acf5e42d58da4d525a8706df538c0ef3b7d55e9b26d45f8db8a6977aa5802d041bb639b0d4618718366333f2768f2dc1b8

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Unreleased
 ------
 
+Version 1.13.1
+--------------
+* [1274](https://github.com/Shopify/shopify-app-cli/pull/1274): Only print api_key during error if it exists
+* [1272](https://github.com/Shopify/shopify-app-cli/pull/1272): Fix minor bug with extension serve for UI extensions
+
 Version 1.13.0
 --------------
 

data/lib/project_types/extension/features/argo_runtime.rb

@@ -7,6 +7,7 @@ module Extension
       ARGO_ADMIN_CLI_PACKAGE_NAME = "@shopify/argo-admin-cli"
 
       ARGO_RUN_0_4_0 = Models::NpmPackage.new(name: "@shopify/argo-run", version: "0.4.0")
+      ARGO_ADMIN_CLI_0_9_0 = Models::NpmPackage.new(name: "@shopify/argo-admin-cli", version: "0.9.0")
       ARGO_ADMIN_CLI_0_9_3 = Models::NpmPackage.new(name: "@shopify/argo-admin-cli", version: "0.9.3")
       ARGO_ADMIN_CLI_0_11_0 = Models::NpmPackage.new(name: "@shopify/argo-admin-cli", version: "0.11.0")
 
@@ -67,6 +68,15 @@ module Extension
         end
       end
 
+      def accepts_name?
+        case cli
+        when admin?
+          cli >= ARGO_ADMIN_CLI_0_9_0
+        else
+          false
+        end
+      end
+
       private
 
       def admin?

data/lib/project_types/extension/features/argo_serve_options.rb

@@ -34,6 +34,7 @@ module Extension
           options << "--argoVersion=#{renderer_package.version}" if argo_runtime.accepts_argo_version?
           options << "--uuid=#{project.registration_uuid}" if argo_runtime.accepts_uuid?
           options << "--publicUrl=#{public_url}" if argo_runtime.accepts_tunnel_url?
+          options << "--name=#{project.title}" if argo_runtime.accepts_name?
         end
       end
     end

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

@@ -16,7 +16,11 @@ module Script
         Layers::Application::PushScript.call(ctx: @ctx, force: options.flags.key?(:force))
         @ctx.puts(@ctx.message("script.push.script_pushed", api_key: api_key))
       rescue StandardError => e
-        msg = @ctx.message("script.push.error.operation_failed", api_key: api_key)
+        msg = if api_key
+          @ctx.message("script.push.error.operation_failed_with_api_key", api_key: api_key)
+        else
+          @ctx.message("script.push.error.operation_failed_no_api_key")
+        end
         UI::ErrorHandler.pretty_print_and_raise(e, failed_op: msg)
       end
 

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

@@ -161,7 +161,8 @@ module Script
           HELP
 
           error: {
-            operation_failed: "Couldn't push script to app (API key: %{api_key}).",
+            operation_failed_with_api_key: "Couldn't push script to app (API key: %{api_key}).",
+            operation_failed_no_api_key: "Couldn't push script to app.",
           },
 
           script_pushed: "{{v}} Script pushed to app (API key: %{api_key}).",

data/lib/project_types/script/tasks/ensure_env.rb

@@ -27,6 +27,8 @@ module Script
       private
 
       def ask_org
+        return stubbed_org if partner_proxy_bypass
+
         if ShopifyCli::Shopifolk.check && wants_to_run_against_shopify_org?
           ShopifyCli::Shopifolk.act_as_shopify_organization
         end
@@ -47,6 +49,23 @@ module Script
         end
       end
 
+      def stubbed_org
+        {
+          "apps" => [
+            {
+              "appType" => "custom",
+              "apiKey" => "stubbed-api-key",
+              "apiSecretKeys" => [{ "secret" => "stubbed-api-secret" }],
+              "title" => "Fake App (Not connected to Partners)",
+            },
+          ],
+        }
+      end
+
+      def partner_proxy_bypass
+        !ENV["BYPASS_PARTNERS_PROXY"].nil?
+      end
+
       def ask_app(apps)
         unless ShopifyCli::Shopifolk.acting_as_shopify_organization?
           apps = apps.select { |app| app["appType"] == "custom" }

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = "1.13.0"
+  VERSION = "1.13.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-08 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler