shopify-cli 1.4.1 → 1.8.0

data/lib/project_types/extension/tasks/get_apps.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Extension
   module Tasks
@@ -18,9 +18,9 @@ module Extension
       end
 
       def apps_owned_by_organization(organization)
-        return [] unless organization.key?('apps') && organization['apps'].any?
+        return [] unless organization.key?("apps") && organization["apps"].any?
 
-        organization['apps'].map do |app|
+        organization["apps"].map do |app|
           Converters::AppConverter.from_hash(app, organization)
         end
       end

data/lib/project_types/extension/tasks/update_draft.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Extension
   module Tasks
     class UpdateDraft < ShopifyCli::Task
       include UserErrors
 
-      GRAPHQL_FILE = 'extension_update_draft'
+      GRAPHQL_FILE = "extension_update_draft"
 
       RESPONSE_FIELD = %w(data extensionUpdateDraft)
-      VERSION_FIELD = 'extensionVersion'
+      VERSION_FIELD = "extensionVersion"
 
       def call(context:, api_key:, registration_id:, config:, extension_context:)
         input = {
@@ -19,7 +19,7 @@ module Extension
           extension_context: extension_context,
         }
         response = ShopifyCli::PartnersAPI.query(context, GRAPHQL_FILE, **input).dig(*RESPONSE_FIELD)
-        context.abort(context.message('tasks.errors.parse_error')) if response.nil?
+        context.abort(context.message("tasks.errors.parse_error")) if response.nil?
 
         abort_if_user_errors(context, response)
         Converters::VersionConverter.from_hash(context, response.dig(VERSION_FIELD))

data/lib/project_types/extension/tasks/user_errors.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Extension
   module Tasks
     module UserErrors
-      USER_ERRORS_FIELD = 'userErrors'
-      MESSAGE_FIELD = 'message'
-      USER_ERRORS_PARSE_ERROR = 'Unable to parse errors from server.'
+      USER_ERRORS_FIELD = "userErrors"
+      MESSAGE_FIELD = "message"
+      USER_ERRORS_PARSE_ERROR = "Unable to parse errors from server."
 
       def abort_if_user_errors(context, response)
         return if response.nil?

data/lib/project_types/node/cli.rb

@@ -1,29 +1,32 @@
 # frozen_string_literal: true
 module Node
   class Project < ShopifyCli::ProjectType
-    creator 'Node.js App', 'Node::Commands::Create'
+    title("Node.js App")
+    creator("Node::Commands::Create")
+    connector("Node::Commands::Connect")
 
-    register_command('Node::Commands::Deploy', "deploy")
-    register_command('Node::Commands::Generate', "generate")
-    register_command('Node::Commands::Open', "open")
-    register_command('Node::Commands::Populate', "populate")
-    register_command('Node::Commands::Serve', "serve")
-    register_command('Node::Commands::Tunnel', "tunnel")
+    register_command("Node::Commands::Deploy", "deploy")
+    register_command("Node::Commands::Generate", "generate")
+    register_command("Node::Commands::Open", "open")
+    register_command("Node::Commands::Populate", "populate")
+    register_command("Node::Commands::Serve", "serve")
+    register_command("Node::Commands::Tunnel", "tunnel")
     # register_task('Node::Tasks::NodeTask', 'node_task')
 
-    require Project.project_filepath('messages/messages')
+    require Project.project_filepath("messages/messages")
     register_messages(Node::Messages::MESSAGES)
   end
 
   # define/autoload project specific Commands
   module Commands
-    autoload :Create, Project.project_filepath('commands/create')
-    autoload :Deploy, Project.project_filepath('commands/deploy')
-    autoload :Generate, Project.project_filepath('commands/generate')
-    autoload :Open, Project.project_filepath('commands/open')
-    autoload :Populate, Project.project_filepath('commands/populate')
-    autoload :Serve, Project.project_filepath('commands/serve')
-    autoload :Tunnel, Project.project_filepath('commands/tunnel')
+    autoload :Connect, Project.project_filepath("commands/connect")
+    autoload :Create, Project.project_filepath("commands/create")
+    autoload :Deploy, Project.project_filepath("commands/deploy")
+    autoload :Generate, Project.project_filepath("commands/generate")
+    autoload :Open, Project.project_filepath("commands/open")
+    autoload :Populate, Project.project_filepath("commands/populate")
+    autoload :Serve, Project.project_filepath("commands/serve")
+    autoload :Tunnel, Project.project_filepath("commands/tunnel")
   end
 
   # define/autoload project specific Tasks
@@ -32,6 +35,6 @@ module Node
 
   # define/autoload project specific Forms
   module Forms
-    autoload :Create, Project.project_filepath('forms/create')
+    autoload :Create, Project.project_filepath("forms/create")
   end
 end

data/lib/project_types/node/commands/connect.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+module Node
+  module Commands
+    class Connect < ShopifyCli::SubCommand
+      def call(*)
+        if ShopifyCli::Project.has_current? && ShopifyCli::Project.current.env
+          @ctx.puts(@ctx.message("node.connect.production_warning"))
+        end
+
+        app = ShopifyCli::Commands::Connect.new.default_connect("node")
+        @ctx.done(@ctx.message("node.connect.connected", app))
+      end
+    end
+  end
+end

data/lib/project_types/node/commands/create.rb

@@ -4,12 +4,14 @@ module Node
     class Create < ShopifyCli::SubCommand
       options do |parser, flags|
         # backwards compatibility allow 'title' for now
-        parser.on('--title=TITLE') { |t| flags[:title] = t }
-        parser.on('--name=NAME') { |t| flags[:title] = t }
-        parser.on('--organization_id=ID') { |url| flags[:organization_id] = url }
-        parser.on('--shop_domain=MYSHOPIFYDOMAIN') { |url| flags[:shop_domain] = url }
-        parser.on('--type=APPTYPE') { |url| flags[:type] = url }
-        parser.on('--verbose') { flags[:verbose] = true }
+        parser.on("--title=TITLE") { |t| flags[:title] = t }
+        parser.on("--name=NAME") { |t| flags[:title] = t }
+        parser.on("--organization_id=ID") { |url| flags[:organization_id] = url }
+        parser.on("--organization-id=ID") { |url| flags[:organization_id] = url }
+        parser.on("--shop_domain=MYSHOPIFYDOMAIN") { |url| flags[:shop_domain] = url }
+        parser.on("--shop-domain=MYSHOPIFYDOMAIN") { |url| flags[:shop_domain] = url }
+        parser.on("--type=APPTYPE") { |url| flags[:type] = url }
+        parser.on("--verbose") { flags[:verbose] = true }
       end
 
       def call(args, _name)
@@ -22,7 +24,7 @@ module Node
 
         ShopifyCli::Project.write(
           @ctx,
-          project_type: 'node',
+          project_type: "node",
           organization_id: form.organization_id,
         )
 
@@ -37,63 +39,65 @@ module Node
           api_key: api_client["apiKey"],
           secret: api_client["apiSecretKeys"].first["secret"],
           shop: form.shop_domain,
-          scopes: 'write_products,write_customers,write_draft_orders',
+          scopes: "write_products,write_customers,write_draft_orders",
         ).write(@ctx)
 
-        partners_url = "#{partners_endpoint}/#{form.organization_id}/apps/#{api_client['id']}"
+        partners_url = ShopifyCli::PartnersAPI.partners_url_for(form.organization_id, api_client["id"], local_debug?)
 
-        @ctx.puts(@ctx.message('node.create.info.created', form.title, partners_url))
-        @ctx.puts(@ctx.message('node.create.info.serve', form.name, ShopifyCli::TOOL_NAME))
-        @ctx.puts(@ctx.message('node.create.info.install', partners_url, form.title))
+        @ctx.puts(@ctx.message("apps.create.info.created", form.title, partners_url))
+        @ctx.puts(@ctx.message("apps.create.info.serve", form.name, ShopifyCli::TOOL_NAME))
+        unless ShopifyCli::Shopifolk.acting_as_shopify_organization?
+          @ctx.puts(@ctx.message("apps.create.info.install", partners_url, form.title))
+        end
       end
 
       def self.help
-        ShopifyCli::Context.message('node.create.help', ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("node.create.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
       end
 
       private
 
       def check_node
-        cmd_path = @ctx.which('node')
-        @ctx.abort(@ctx.message('node.create.error.node_required')) if cmd_path.nil?
+        cmd_path = @ctx.which("node")
+        @ctx.abort(@ctx.message("node.create.error.node_required")) if cmd_path.nil?
 
-        version, stat = @ctx.capture2e('node', '-v')
-        @ctx.abort(@ctx.message('node.create.error.node_version_failure')) unless stat.success?
+        version, stat = @ctx.capture2e("node", "-v")
+        @ctx.abort(@ctx.message("node.create.error.node_version_failure")) unless stat.success?
 
-        @ctx.done(@ctx.message('node.create.node_version', version))
+        @ctx.done(@ctx.message("node.create.node_version", version))
       end
 
       def check_npm
-        cmd_path = @ctx.which('npm')
-        @ctx.abort(@ctx.message('node.create.error.npm_required')) if cmd_path.nil?
+        cmd_path = @ctx.which("npm")
+        @ctx.abort(@ctx.message("node.create.error.npm_required")) if cmd_path.nil?
 
-        version, stat = @ctx.capture2e('npm', '-v')
-        @ctx.abort(@ctx.message('node.create.error.npm_version_failure')) unless stat.success?
+        version, stat = @ctx.capture2e("npm", "-v")
+        @ctx.abort(@ctx.message("node.create.error.npm_version_failure")) unless stat.success?
 
-        @ctx.done(@ctx.message('node.create.npm_version', version))
+        @ctx.done(@ctx.message("node.create.npm_version", version))
       end
 
       def set_npm_config
         # check available npmrc (either user or system) for production registry
-        registry, _ = @ctx.capture2('npm config get @shopify:registry')
-        return if registry.include?('https://registry.yarnpkg.com')
+        registry, _ = @ctx.capture2("npm config get @shopify:registry")
+        return if registry.include?("https://registry.yarnpkg.com")
 
         # available npmrc doesn't have production registry =>
         # set a project-based .npmrc
         @ctx.system(
-          'npm',
-          '--userconfig',
-          './.npmrc',
-          'config',
-          'set',
-          '@shopify:registry',
-          'https://registry.yarnpkg.com',
+          "npm",
+          "--userconfig",
+          "./.npmrc",
+          "config",
+          "set",
+          "@shopify:registry",
+          "https://registry.yarnpkg.com",
           chdir: @ctx.root
         )
       end
 
       def build(name)
-        ShopifyCli::Git.clone('https://github.com/Shopify/shopify-app-node.git', name)
+        ShopifyCli::Git.clone("https://github.com/Shopify/shopify-app-node.git", name)
 
         @ctx.root = File.join(@ctx.root, name)
 
@@ -101,21 +105,20 @@ module Node
         ShopifyCli::JsDeps.install(@ctx, !options.flags[:verbose].nil?)
 
         begin
-          @ctx.rm_r('.git')
-          @ctx.rm_r('.github')
-          @ctx.rm(File.join('server', 'handlers', 'client.js'))
+          @ctx.rm_r(".git")
+          @ctx.rm_r(".github")
+          @ctx.rm(File.join("server", "handlers", "client.js"))
           @ctx.rename(
-            File.join('server', 'handlers', 'client.cli.js'),
-            File.join('server', 'handlers', 'client.js')
+            File.join("server", "handlers", "client.cli.js"),
+            File.join("server", "handlers", "client.js")
           )
         rescue Errno::ENOENT => e
           @ctx.debug(e)
         end
       end
 
-      def partners_endpoint
-        return 'https://partners.myshopify.io' if @ctx.getenv(ShopifyCli::PartnersAPI::LOCAL_DEBUG)
-        'https://partners.shopify.com'
+      def local_debug?
+        @ctx.getenv(ShopifyCli::PartnersAPI::LOCAL_DEBUG)
       end
     end
   end

data/lib/project_types/node/commands/deploy.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Node
   module Commands
     class Deploy < ShopifyCli::Command
-      subcommand :Heroku, 'heroku', Project.project_filepath('commands/deploy/heroku')
+      subcommand :Heroku, "heroku", Project.project_filepath("commands/deploy/heroku")
 
       def call(*)
         @ctx.puts(self.class.help)
       end
 
       def self.help
-        ShopifyCli::Context.message('node.deploy.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("node.deploy.help", ShopifyCli::TOOL_NAME)
       end
 
       def self.extended_help
-        ShopifyCli::Context.message('node.deploy.extended_help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("node.deploy.extended_help", ShopifyCli::TOOL_NAME)
       end
     end
   end

data/lib/project_types/node/commands/deploy/heroku.rb

@@ -1,70 +1,70 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Node
   module Commands
     class Deploy
       class Heroku < ShopifyCli::SubCommand
         def self.help
-          ShopifyCli::Context.message('node.deploy.heroku.help', ShopifyCli::TOOL_NAME)
+          ShopifyCli::Context.message("node.deploy.heroku.help", ShopifyCli::TOOL_NAME)
         end
 
         def call(*)
           spin_group = CLI::UI::SpinGroup.new
           heroku_service = ShopifyCli::Heroku.new(@ctx)
 
-          spin_group.add(@ctx.message('node.deploy.heroku.downloading')) do |spinner|
+          spin_group.add(@ctx.message("node.deploy.heroku.downloading")) do |spinner|
             heroku_service.download
-            spinner.update_title(@ctx.message('node.deploy.heroku.downloaded'))
+            spinner.update_title(@ctx.message("node.deploy.heroku.downloaded"))
           end
           spin_group.wait
 
           install_message = @ctx.message(
-            @ctx.windows? ? 'node.deploy.heroku.installing_windows' : 'node.deploy.heroku.installing'
+            @ctx.windows? ? "node.deploy.heroku.installing_windows" : "node.deploy.heroku.installing"
           )
           spin_group.add(install_message) do |spinner|
             heroku_service.install
-            spinner.update_title(@ctx.message('node.deploy.heroku.installed'))
+            spinner.update_title(@ctx.message("node.deploy.heroku.installed"))
           end
           spin_group.wait
 
-          spin_group.add(@ctx.message('node.deploy.heroku.git.checking')) do |spinner|
+          spin_group.add(@ctx.message("node.deploy.heroku.git.checking")) do |spinner|
             ShopifyCli::Git.init(@ctx)
-            spinner.update_title(@ctx.message('node.deploy.heroku.git.initialized'))
+            spinner.update_title(@ctx.message("node.deploy.heroku.git.initialized"))
           end
           spin_group.wait
 
           if (account = heroku_service.whoami)
-            @ctx.puts(@ctx.message('node.deploy.heroku.authenticated_with_account', account))
+            @ctx.puts(@ctx.message("node.deploy.heroku.authenticated_with_account", account))
           else
             CLI::UI::Frame.open(
-              @ctx.message('node.deploy.heroku.authenticating'),
-              success_text: @ctx.message('node.deploy.heroku.authenticated')
+              @ctx.message("node.deploy.heroku.authenticating"),
+              success_text: @ctx.message("node.deploy.heroku.authenticated")
             ) do
               heroku_service.authenticate
             end
           end
 
           if (app_name = heroku_service.app)
-            @ctx.puts(@ctx.message('node.deploy.heroku.app.selected', app_name))
+            @ctx.puts(@ctx.message("node.deploy.heroku.app.selected", app_name))
           else
-            app_type = CLI::UI::Prompt.ask(@ctx.message('node.deploy.heroku.app.no_apps_found')) do |handler|
-              handler.option(@ctx.message('node.deploy.heroku.app.create')) { :new }
-              handler.option(@ctx.message('node.deploy.heroku.app.select')) { :existing }
+            app_type = CLI::UI::Prompt.ask(@ctx.message("node.deploy.heroku.app.no_apps_found")) do |handler|
+              handler.option(@ctx.message("node.deploy.heroku.app.create")) { :new }
+              handler.option(@ctx.message("node.deploy.heroku.app.select")) { :existing }
             end
 
             if app_type == :existing
-              app_name = CLI::UI::Prompt.ask(@ctx.message('node.deploy.heroku.app.name'))
+              app_name = CLI::UI::Prompt.ask(@ctx.message("node.deploy.heroku.app.name"))
               CLI::UI::Frame.open(
-                @ctx.message('node.deploy.heroku.app.selecting', app_name),
-                success_text: @ctx.message('node.deploy.heroku.app.selected', app_name)
+                @ctx.message("node.deploy.heroku.app.selecting", app_name),
+                success_text: @ctx.message("node.deploy.heroku.app.selected", app_name)
               ) do
                 heroku_service.select_existing_app(app_name)
               end
             elsif app_type == :new
               CLI::UI::Frame.open(
-                @ctx.message('node.deploy.heroku.app.creating'),
-                success_text: @ctx.message('node.deploy.heroku.app.created')
+                @ctx.message("node.deploy.heroku.app.creating"),
+                success_text: @ctx.message("node.deploy.heroku.app.created")
               ) do
                 heroku_service.create_new_app
               end
@@ -74,9 +74,9 @@ module Node
           branches = ShopifyCli::Git.branches(@ctx)
           if branches.length == 1
             branch_to_deploy = branches[0]
-            @ctx.puts(@ctx.message('node.deploy.heroku.git.branch_selected', branch_to_deploy))
+            @ctx.puts(@ctx.message("node.deploy.heroku.git.branch_selected", branch_to_deploy))
           else
-            branch_to_deploy = CLI::UI::Prompt.ask(@ctx.message('node.deploy.heroku.git.what_branch')) do |handler|
+            branch_to_deploy = CLI::UI::Prompt.ask(@ctx.message("node.deploy.heroku.git.what_branch")) do |handler|
               branches.each do |branch|
                 handler.option(branch) { branch }
               end
@@ -84,8 +84,8 @@ module Node
           end
 
           CLI::UI::Frame.open(
-            @ctx.message('node.deploy.heroku.deploying'),
-            success_text: @ctx.message('node.deploy.heroku.deployed')
+            @ctx.message("node.deploy.heroku.deploying"),
+            success_text: @ctx.message("node.deploy.heroku.deployed")
           ) do
             heroku_service.deploy(branch_to_deploy)
           end

data/lib/project_types/node/commands/generate.rb

@@ -1,32 +1,23 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Node
   module Commands
     class Generate < ShopifyCli::Command
-      subcommand :Page, 'page', Project.project_filepath('commands/generate/page')
-      subcommand :Billing, 'billing', Project.project_filepath('commands/generate/billing')
-      subcommand :Webhook, 'webhook', Project.project_filepath('commands/generate/webhook')
+      subcommand :Page, "page", Project.project_filepath("commands/generate/page")
+      subcommand :Billing, "billing", Project.project_filepath("commands/generate/billing")
+      subcommand :Webhook, "webhook", Project.project_filepath("commands/generate/webhook")
 
       def call(*)
         @ctx.puts(self.class.help)
       end
 
       def self.help
-        ShopifyCli::Context.message('node.generate.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("node.generate.help")
       end
 
       def self.extended_help
-        extended_help = "{{bold:Subcommands:}}\n"
-        subcommand_registry.resolved_commands.sort.each do |name, klass|
-          extended_help += "  {{cyan:#{name}}}: "
-
-          if (subcmd_help = klass.help)
-            extended_help += subcmd_help.gsub("\n  ", "\n    ")
-          end
-          extended_help += "\n"
-        end
-        extended_help += ShopifyCli::Context.message('node.generate.extended_help', ShopifyCli::TOOL_NAME)
+        help
       end
 
       def self.run_generate(script, name, ctx)
@@ -39,11 +30,11 @@ module Node
       def self.response(code, name, ctx)
         case code
         when 1
-          ctx.message('node.generate.error.generic', name)
+          ctx.message("node.generate.error.generic", name)
         when 2
-          ctx.message('node.generate.error.name_exists', name)
+          ctx.message("node.generate.error.name_exists", name)
         else
-          ctx.message('node.error.generic')
+          ctx.message("node.error.generic")
         end
       end
     end