shopify-cli 1.10.0 → 1.14.0

data/lib/shopify-cli/method_object.rb

@@ -52,8 +52,8 @@ module ShopifyCli
       # invokes the original `call` implementation and wraps its return value
       # into a result object.
       #
-      def call(*args, **kwargs)
-        Result.wrap { super(*args, **kwargs) }.call
+      def call(*args, **kwargs, &block)
+        Result.wrap { kwargs.any? ? super(*args, **kwargs, &block) : super(*args, &block) }.call
       end
     end
 
@@ -64,10 +64,10 @@ module ShopifyCli
       # initializer or to `call`. If the keyword argument matches the name of
       # property, it is forwarded to the initializer, otherwise to call.
       #
-      def call(*args, **kwargs)
+      def call(*args, **kwargs, &block)
         properties.keys.yield_self do |properties|
           new(**kwargs.slice(*properties))
-            .call(*args, **kwargs.slice(*(kwargs.keys - properties)))
+            .call(*args, **kwargs.slice(*(kwargs.keys - properties)), &block)
         end
       end
 

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.rb

@@ -59,11 +59,14 @@ module ShopifyCli
 
       private
 
-      def authenticated_req(ctx)
-        yield
+      def authenticated_req(ctx, &block)
+        CLI::Kit::Util
+          .begin(&block)
+          .retry_after(API::APIRequestUnauthorizedError, retries: 1) do
+            authenticate(ctx)
+          end
       rescue API::APIRequestUnauthorizedError
-        authenticate(ctx)
-        retry
+        ctx.abort(ctx.message("core.api.error.failed_auth"))
       rescue API::APIRequestNotFoundError
         ctx.puts(ctx.message("core.partners_api.error.account_not_found", ShopifyCli::TOOL_NAME))
       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/resources/env_file.rb

@@ -22,7 +22,7 @@ module ShopifyCli
         def parse(directory)
           File.read(File.join(directory, FILENAME))
             .gsub("\r\n", "\n").split("\n").each_with_object({}) do |line, output|
-            match = /\A([A-Za-z_0-9]+)=(.*)\z/.match(line)
+            match = /\A([A-Za-z_0-9]+)\s*=\s*(.*)\z/.match(line)
             if match
               key = match[1]
               output[key] = case match[2]

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/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.14.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.14.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-06-23 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
@@ -222,23 +227,24 @@ files:
 - lib/project_types/script/layers/application/extension_points.rb
 - lib/project_types/script/layers/application/project_dependencies.rb
 - lib/project_types/script/layers/application/push_script.rb
-- lib/project_types/script/layers/domain/config_ui.rb
 - lib/project_types/script/layers/domain/errors.rb
 - lib/project_types/script/layers/domain/extension_point.rb
 - lib/project_types/script/layers/domain/metadata.rb
 - lib/project_types/script/layers/domain/push_package.rb
+- lib/project_types/script/layers/domain/script_json.rb
 - 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
+- lib/project_types/script/layers/infrastructure/languages/assemblyscript_project_creator.rb
+- lib/project_types/script/layers/infrastructure/languages/assemblyscript_task_runner.rb
+- lib/project_types/script/layers/infrastructure/languages/project_creator.rb
+- lib/project_types/script/layers/infrastructure/languages/rust_project_creator.rb
+- lib/project_types/script/layers/infrastructure/languages/rust_task_runner.rb
+- lib/project_types/script/layers/infrastructure/languages/task_runner.rb
 - lib/project_types/script/layers/infrastructure/push_package_repository.rb
-- lib/project_types/script/layers/infrastructure/rust_project_creator.rb
-- lib/project_types/script/layers/infrastructure/rust_task_runner.rb
 - lib/project_types/script/layers/infrastructure/script_project_repository.rb
 - lib/project_types/script/layers/infrastructure/script_service.rb
-- lib/project_types/script/layers/infrastructure/task_runner.rb
 - lib/project_types/script/messages/messages.rb
 - lib/project_types/script/tasks/ensure_env.rb
 - lib/project_types/script/ui/error_handler.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

data/lib/project_types/script/layers/domain/config_ui.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Layers
-    module Domain
-      class ConfigUi
-        attr_reader :filename, :content
-
-        def initialize(filename:, content:)
-          @filename = filename
-          @content = content
-        end
-      end
-    end
-  end
-end

data/lib/project_types/script/layers/infrastructure/assemblyscript_project_creator.rb

@@ -1,100 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Layers
-    module Infrastructure
-      class AssemblyScriptProjectCreator
-        include SmartProperties
-        property! :ctx, accepts: ShopifyCli::Context
-        property! :extension_point, accepts: Domain::ExtensionPoint
-        property! :script_name, accepts: String
-        property! :path_to_project, accepts: String
-
-        BOOTSTRAP = "npx --no-install shopify-scripts-toolchain-as bootstrap --from %{extension_point} --dest %{base}"
-        BUILD = "shopify-scripts-toolchain-as build --src src/shopify_main.ts " \
-        "--binary build/%{script_name}.wasm --metadata build/metadata.json"
-        MIN_NODE_VERSION = "14.5.0"
-        ASC_ARGS = "-- --lib node_modules --optimize --use Date="
-
-        def setup_dependencies
-          write_npmrc
-          write_package_json
-        end
-
-        def bootstrap
-          out, status = ctx.capture2e(bootstap_command)
-          raise Domain::Errors::ServiceFailureError, out unless status.success?
-        end
-
-        private
-
-        def write_npmrc
-          ctx.system(
-            "npm", "--userconfig", "./.npmrc", "config", "set", "@shopify:registry", "https://registry.npmjs.com"
-          )
-          ctx.system(
-            "npm", "--userconfig", "./.npmrc", "config", "set", "engine-strict", "true"
-          )
-        end
-
-        def extension_point_version
-          if extension_point.sdks.assemblyscript.versioned?
-            return extension_point.sdks.assemblyscript.version
-          end
-
-          out, status = ctx.capture2e("npm show #{extension_point.sdks.assemblyscript.package} version --json")
-          raise Domain::Errors::ServiceFailureError, out unless status.success?
-          "^#{JSON.parse(out)}"
-        end
-
-        def write_package_json
-          package_json = <<~HERE
-            {
-              "name": "#{script_name}",
-              "version": "1.0.0",
-              "devDependencies": {
-                "@shopify/scripts-sdk-as": "#{extension_point.sdks.assemblyscript.sdk_version}",
-                "@shopify/scripts-toolchain-as": "#{extension_point.sdks.assemblyscript.toolchain_version}",
-                "#{extension_point.sdks.assemblyscript.package}": "#{extension_point_version}",
-                "@as-pect/cli": "^6.0.0",
-                "assemblyscript": "^0.18.13"
-              },
-              "scripts": {
-                "test": "asp --summary --verbose",
-                "build": "#{build_command}"
-              },
-              "engines": {
-                "node": ">=#{MIN_NODE_VERSION}"
-              }
-            }
-          HERE
-          ctx.write("package.json", package_json)
-        end
-
-        def bootstap_command
-          type = extension_point.dasherize_type
-          base_command = format(BOOTSTRAP, extension_point: type, base: path_to_project)
-          domain = extension_point.domain
-
-          if domain.nil?
-            base_command
-          else
-            "#{base_command} --domain #{domain}"
-          end
-        end
-
-        def build_command
-          type = extension_point.dasherize_type
-          base_command = format(BUILD, script_name: script_name)
-          domain = extension_point.domain
-
-          if domain.nil?
-            "#{base_command} #{ASC_ARGS}"
-          else
-            "#{base_command} --domain #{domain} --ep #{type} #{ASC_ARGS}"
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Layers
-    module Infrastructure
-      class AssemblyScriptTaskRunner
-        BYTECODE_FILE = "build/%{name}.wasm"
-        METADATA_FILE = "build/metadata.json"
-        SCRIPT_SDK_BUILD = "npm run build"
-
-        attr_reader :ctx, :script_name
-
-        def initialize(ctx, script_name)
-          @ctx = ctx
-          @script_name = script_name
-        end
-
-        def build
-          compile
-          bytecode
-        end
-
-        def compiled_type
-          "wasm"
-        end
-
-        def install_dependencies
-          check_node_version!
-
-          output, status = ctx.capture2e("npm install --no-audit --no-optional --legacy-peer-deps --loglevel error")
-          raise Errors::DependencyInstallError, output unless status.success?
-        end
-
-        def dependencies_installed?
-          # Assuming if node_modules folder exist at root of script folder, all deps are installed
-          ctx.dir_exist?("node_modules")
-        end
-
-        def metadata
-          unless @ctx.file_exist?(METADATA_FILE)
-            msg = @ctx.message("script.error.metadata_not_found_cause", METADATA_FILE)
-            raise Domain::Errors::MetadataNotFoundError, msg
-          end
-
-          raw_contents = File.read(METADATA_FILE)
-          Domain::Metadata.create_from_json(@ctx, raw_contents)
-        end
-
-        private
-
-        def check_node_version!
-          output, status = @ctx.capture2e("node", "--version")
-          raise Errors::DependencyInstallError, output unless status.success?
-
-          require "semantic/semantic"
-          version = ::Semantic::Version.new(output[1..-1])
-          unless version >= ::Semantic::Version.new(AssemblyScriptProjectCreator::MIN_NODE_VERSION)
-            raise Errors::DependencyInstallError,
-              "Node version must be >= v#{AssemblyScriptProjectCreator::MIN_NODE_VERSION}. "\
-              "Current version: #{output.strip}."
-          end
-        end
-
-        def compile
-          check_compilation_dependencies!
-
-          out, status = ctx.capture2e(SCRIPT_SDK_BUILD)
-          raise Domain::Errors::ServiceFailureError, out unless status.success?
-        end
-
-        def check_compilation_dependencies!
-          pkg = JSON.parse(File.read("package.json"))
-          build_script = pkg.dig("scripts", "build")
-
-          raise Errors::BuildScriptNotFoundError,
-            "Build script not found" if build_script.nil?
-
-          unless build_script.start_with?("shopify-scripts")
-            raise Errors::InvalidBuildScriptError, "Invalid build script"
-          end
-        end
-
-        def bytecode
-          filename = format(BYTECODE_FILE, name: script_name)
-          raise Errors::WebAssemblyBinaryNotFoundError unless ctx.file_exist?(filename)
-
-          contents = ctx.binread(filename)
-          ctx.rm(filename)
-
-          contents
-        end
-      end
-    end
-  end
-end