shopify-cli 1.10.0 → 1.11.0

data/lib/shopify-cli/oauth.rb

@@ -80,7 +80,13 @@ module ShopifyCli
     end
 
     def output_authentication_info(uri)
-      login_location = ctx.message(service == "admin" ? "core.oauth.location.admin" : "core.oauth.location.partner")
+      login_location = if service == "admin"
+        ctx.message("core.oauth.location.admin")
+      elsif Shopifolk.acting_as_shopify_organization?
+        ctx.message("core.oauth.location.shopifolk")
+      else
+        ctx.message("core.oauth.location.partner")
+      end
       ctx.puts(ctx.message("core.oauth.authentication_required", login_location))
       ctx.open_url!(uri)
     end

data/lib/shopify-cli/partners_api/organizations.rb

@@ -4,7 +4,7 @@ module ShopifyCli
       class << self
         def fetch_all(ctx)
           resp = PartnersAPI.query(ctx, "all_organizations")
-          (resp.dig("data", "organizations", "nodes") || []).map do |org|
+          (resp&.dig("data", "organizations", "nodes") || []).map do |org|
             org["stores"] = (org.dig("stores", "nodes") || [])
             org
           end
@@ -12,7 +12,7 @@ module ShopifyCli
 
         def fetch(ctx, id:)
           resp = PartnersAPI.query(ctx, "find_organization", id: id)
-          org = resp.dig("data", "organizations", "nodes").first
+          org = resp&.dig("data", "organizations", "nodes")&.first
           return nil if org.nil?
           org["stores"] = (org.dig("stores", "nodes") || [])
           org
@@ -20,7 +20,7 @@ module ShopifyCli
 
         def fetch_with_app(ctx)
           resp = PartnersAPI.query(ctx, "all_orgs_with_apps")
-          (resp.dig("data", "organizations", "nodes") || []).map do |org|
+          (resp&.dig("data", "organizations", "nodes") || []).map do |org|
             org["stores"] = (org.dig("stores", "nodes") || [])
             org["apps"] = (org.dig("apps", "nodes") || [])
             org

data/lib/shopify-cli/tasks/select_org_and_shop.rb

@@ -35,14 +35,16 @@ module ShopifyCli
         @organization ||= if !organization_id.nil?
           org = ShopifyCli::PartnersAPI::Organizations.fetch(ctx, id: organization_id)
           if org.nil?
-            ctx.puts(ctx.message("core.tasks.select_org_and_shop.error.authentication_issue", ShopifyCli::TOOL_NAME))
+            ctx.puts(ctx.message("core.tasks.select_org_and_shop.authentication_issue", ShopifyCli::TOOL_NAME))
             ctx.abort(ctx.message("core.tasks.select_org_and_shop.error.organization_not_found"))
           end
           org
         elsif organizations.count == 0
-          ctx.puts(ctx.message("core.tasks.select_org_and_shop.error.partners_notice"))
-          ctx.puts(ctx.message("core.tasks.select_org_and_shop.authentication_issue", ShopifyCli::TOOL_NAME))
-          ctx.abort(ctx.message("core.tasks.select_org_and_shop.error.no_organizations"))
+          if Shopifolk.acting_as_shopify_organization?
+            ctx.abort(ctx.message("core.tasks.select_org_and_shop.error.shopifolk_notice", ShopifyCli::TOOL_NAME))
+          else
+            ctx.abort(ctx.message("core.tasks.select_org_and_shop.error.no_organizations"))
+          end
         elsif organizations.count == 1
           org = organizations.first
           ctx.puts(ctx.message("core.tasks.select_org_and_shop.organization", org["businessName"], org["id"]))

data/lib/shopify-cli/tunnel.rb

@@ -2,6 +2,7 @@ require "json"
 require "fileutils"
 require "shopify_cli"
 require "forwardable"
+require "uri"
 
 module ShopifyCli
   ##
@@ -11,7 +12,7 @@ module ShopifyCli
   class Tunnel
     extend SingleForwardable
 
-    def_delegators :new, :start, :stop, :auth, :stats, :urls
+    def_delegators :new, :start, :stop, :auth, :stats, :urls, :running_on?
 
     class FetchUrlError < RuntimeError; end
     class NgrokError < RuntimeError; end
@@ -26,6 +27,7 @@ module ShopifyCli
 
     NGROK_TUNNELS_URI = URI.parse("http://localhost:4040/api/tunnels")
     TUNNELS_FIELD = "tunnels"
+    TUNNEL_ADDRESS_KEY_PATH = ["config", "addr"]
     PUBLIC_URL_FIELD = "public_url"
 
     ##
@@ -120,6 +122,25 @@ module ShopifyCli
       []
     end
 
+    ##
+    # Returns Boolean if a tunnel is running on a given port
+    #
+    # #### Parameters
+    #
+    # * `port` - port to check
+    #
+    # #### Returns
+    #
+    # * true / false
+    #
+    def running_on?(port)
+      extract_port = ->(tunnel) { URI(tunnel.dig(*TUNNEL_ADDRESS_KEY_PATH)).port }
+      matches_port = ->(occupied_port) { occupied_port == port }
+      stats.fetch(TUNNELS_FIELD, []).map(&extract_port).any?(&matches_port)
+    rescue
+      false
+    end
+
     private
 
     def install(ctx)

data/lib/shopify-cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,8 +144,9 @@ files:
 - lib/project_types/extension/features/argo.rb
 - lib/project_types/extension/features/argo_config.rb
 - lib/project_types/extension/features/argo_dependencies.rb
-- lib/project_types/extension/features/argo_renderer_package.rb
+- lib/project_types/extension/features/argo_runtime.rb
 - lib/project_types/extension/features/argo_serve.rb
+- lib/project_types/extension/features/argo_serve_options.rb
 - lib/project_types/extension/features/argo_setup.rb
 - lib/project_types/extension/features/argo_setup_step.rb
 - lib/project_types/extension/features/argo_setup_steps.rb
@@ -157,13 +158,16 @@ files:
 - lib/project_types/extension/messages/messages.rb
 - lib/project_types/extension/models/app.rb
 - lib/project_types/extension/models/lazy_specification_handler.rb
+- lib/project_types/extension/models/npm_package.rb
 - lib/project_types/extension/models/registration.rb
 - lib/project_types/extension/models/specification.rb
+- lib/project_types/extension/models/specification_handlers/checkout_argo_extension.rb
 - lib/project_types/extension/models/specification_handlers/checkout_post_purchase.rb
 - lib/project_types/extension/models/specification_handlers/default.rb
 - lib/project_types/extension/models/specifications.rb
 - lib/project_types/extension/models/validation_error.rb
 - lib/project_types/extension/models/version.rb
+- lib/project_types/extension/tasks/choose_next_available_port.rb
 - lib/project_types/extension/tasks/configure_features.rb
 - lib/project_types/extension/tasks/converters/app_converter.rb
 - lib/project_types/extension/tasks/converters/registration_converter.rb
@@ -171,6 +175,7 @@ files:
 - lib/project_types/extension/tasks/converters/version_converter.rb
 - lib/project_types/extension/tasks/create_extension.rb
 - lib/project_types/extension/tasks/fetch_specifications.rb
+- lib/project_types/extension/tasks/find_npm_packages.rb
 - lib/project_types/extension/tasks/get_app.rb
 - lib/project_types/extension/tasks/get_apps.rb
 - lib/project_types/extension/tasks/update_draft.rb
@@ -230,6 +235,7 @@ files:
 - lib/project_types/script/layers/domain/script_project.rb
 - lib/project_types/script/layers/infrastructure/assemblyscript_project_creator.rb
 - lib/project_types/script/layers/infrastructure/assemblyscript_task_runner.rb
+- lib/project_types/script/layers/infrastructure/command_runner.rb
 - lib/project_types/script/layers/infrastructure/errors.rb
 - lib/project_types/script/layers/infrastructure/extension_point_repository.rb
 - lib/project_types/script/layers/infrastructure/project_creator.rb
@@ -465,7 +471,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.17
 signing_key: 
 specification_version: 4
 summary: Shopify CLI helps you build Shopify apps faster.

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

@@ -1,47 +0,0 @@
-module Extension
-  module Features
-    class ArgoRendererPackage
-      include SmartProperties
-
-      ARGO_CHECKOUT = "@shopify/argo-checkout"
-      ARGO_ADMIN = "@shopify/argo-admin"
-      ARGO_POST_PURCHASE = "@shopify/argo-post-purchase"
-
-      PACKAGE_NAMES = [
-        ARGO_CHECKOUT,
-        ARGO_ADMIN,
-        ARGO_POST_PURCHASE,
-      ].freeze
-      MINIMUM_ARGO_VERSION = "0.9.3".freeze
-
-      property! :package_name, accepts: PACKAGE_NAMES
-      property! :version, accepts: String
-
-      class << self
-        def from_package_manager(package_manager_output)
-          pattern = /(?<name>#{PACKAGE_NAMES.join("|")})@(?<version>\d.*)$/
-          match = package_manager_output.match(pattern)
-          raise PackageNotFound, package_manager_output if match.nil?
-          new(package_name: match[:name], version: match[:version].strip)
-        end
-      end
-
-      def checkout?
-        package_name == ARGO_CHECKOUT
-      end
-
-      def admin?
-        package_name == ARGO_ADMIN
-      end
-
-      ##
-      # Temporarily returns false in all cases as the argo webpack server is
-      # unable to handle the UUID flag.
-      def supports_uuid_flag?
-        false
-        # return false if checkout?
-        # Gem::Version.new(version) > Gem::Version.new(MINIMUM_ARGO_VERSION)
-      end
-    end
-  end
-end