shopify-cli 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1ca8221a25313b8cd908a02e4c5c68dc9f74ed38e7472804346419e45d8d9d8
-  data.tar.gz: b0658aae7cb7ca368b78aa80f3fab364867bc1d6ae36515c07f3692bb87730cb
+  metadata.gz: 45acefe059ce1e83e77f20be8ee3b7815c5be28f834ef7697dd9000175884c4f
+  data.tar.gz: a1abb2765725c6a1d593f869c323f179429b7c21d25de9bfa8649e5817dc9d6e
 SHA512:
-  metadata.gz: 54fde8fed1098f483c817cfb0dd8d9ab291556da026dabcc7d0e0dc934fb9c2e97dd2865d72257ca75a2c5d1560759e4ece27c8acc76a8a56f299e8f004594f0
-  data.tar.gz: b193f5f389c2a03875e98d4636aa3cd16c7bfe212d798defed234233b0aad410382e3f56d83b58f63189b6f8256be762518c4439bfe732961c682db8fd81cb25
+  metadata.gz: 5f73366ea4f16f7d5615fe6ae62edd58692f85288b7f6056be61a4cbcbf72c94a1979cc806255fe55c82504f42433c1264ca9b479203639dbaf209273189cccc
+  data.tar.gz: 556ef6bdc6338c156d1ef6c9f9971e37d687cd7c1c8c93f6dc609a053f2303cde7d03b968e2e0e2336e59bc5b89539e8fb3a12f38e3427bbddb29bf448d7f130

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Unreleased
 ------
 
+Version 1.12.0
+--------------
+* [1255](https://github.com/Shopify/shopify-app-cli/pull/1255): Fix beta flag checks when running `shopify serve`
+
 Version 1.11.0
 --------------
 * [#1221](https://github.com/Shopify/shopify-app-cli/pull/1221): Prioritizes returning an HTTPS URL over HTTP from `shopify tunnel status`.

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

@@ -12,6 +12,7 @@ module Extension
 
       property! :renderer, accepts: Models::NpmPackage
       property! :cli, accepts: Models::NpmPackage
+      property :beta_access, accepts: Array, default: -> { [] }
 
       def accepts_port?
         case cli
@@ -49,6 +50,26 @@ module Extension
         end
       end
 
+      def accepts_shop?
+        return false unless beta_access.include?(:argo_admin_beta)
+        case cli
+        when admin?
+          cli >= ARGO_ADMIN_CLI_0_11_0
+        else
+          false
+        end
+      end
+
+      def accepts_api_key?
+        return false unless beta_access.include?(:argo_admin_beta)
+        case cli
+        when admin?
+          cli >= ARGO_ADMIN_CLI_0_11_0
+        else
+          false
+        end
+      end
+
       private
 
       def admin?

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

@@ -8,6 +8,7 @@ module Extension
       property! :context, accepts: ShopifyCli::Context
       property! :port, accepts: Integer, default: 39351
       property  :tunnel_url, accepts: String, default: ""
+      property :beta_access, accepts: Array, default: -> { [] }
 
       def call
         validate_env!
@@ -58,10 +59,10 @@ module Extension
       def validate_env!
         ExtensionProject.reload
 
-        ShopifyCli::Shopifolk.check && ShopifyCli::Feature.enabled?(:argo_admin_beta)
-
         return if required_fields.none?
 
+        return unless beta_access.include?(:argo_admin_beta)
+
         ShopifyCli::Tasks::EnsureEnv.call(context, required: required_fields)
         ShopifyCli::Tasks::EnsureDevStore.call(context) if required_fields.include?(:shop)
 

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

@@ -25,11 +25,12 @@ module Extension
 
       def options
         project = ExtensionProject.current
+        api_key = project.env.api_key
 
         @serve_options ||= [].tap do |options|
           options << "--port=#{port}" if argo_runtime.accepts_port?
-          options << "--shop=#{project.env.shop}" if required_fields.include?(:shop)
-          options << "--apiKey=#{project.env.api_key}" if required_fields.include?(:api_key)
+          options << "--shop=#{project.env.shop}" if required_fields.include?(:shop) && argo_runtime.accepts_shop?
+          options << "--apiKey=#{api_key}" if required_fields.include?(:api_key) && argo_runtime.accepts_api_key?
           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?

data/lib/project_types/extension/models/specification_handlers/default.rb

@@ -51,8 +51,14 @@ module Extension
         end
 
         def serve(context:, port:, tunnel_url:)
-          Features::ArgoServe.new(specification_handler: self, argo_runtime: argo_runtime(context),
-          context: context, port: port, tunnel_url: tunnel_url).call
+          Features::ArgoServe.new(
+            specification_handler: self,
+            argo_runtime: argo_runtime(context),
+            context: context,
+            port: port,
+            tunnel_url: tunnel_url,
+            beta_access: beta_access
+          ).call
         end
 
         def renderer_package(context)
@@ -62,10 +68,19 @@ module Extension
         def argo_runtime(context)
           @argo_runtime ||= Features::ArgoRuntime.new(
             renderer: renderer_package(context),
-            cli: cli_package(context)
+            cli: cli_package(context),
+            beta_access: beta_access
           )
         end
 
+        def beta_access
+          argo_admin_beta? ? [:argo_admin_beta] : []
+        end
+
+        def argo_admin_beta?
+          ShopifyCli::Shopifolk.check && ShopifyCli::Feature.enabled?(:argo_admin_beta)
+        end
+
         def cli_package(context)
           cli_package_name = specification.features.argo&.cli_package_name
           return unless cli_package_name

data/lib/shopify-cli/shopifolk.rb

@@ -33,7 +33,7 @@ module ShopifyCli
       end
 
       def acting_as_shopify_organization?
-        !!@acting_as_shopify_organization || (Project.has_current? && Project.current.config["shopify_organization"])
+        !!(@acting_as_shopify_organization || (Project.has_current? && Project.current.config["shopify_organization"]))
       end
 
       def reset

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = "1.11.0"
+  VERSION = "1.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler