shopify-cli 1.3.0 → 1.6.0

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

@@ -40,11 +40,13 @@ module Node
           scopes: 'write_products,write_customers,write_draft_orders',
         ).write(@ctx)
 
-        partners_url = "https://partners.shopify.com/#{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
@@ -112,6 +114,10 @@ module Node
           @ctx.debug(e)
         end
       end
+
+      def local_debug?
+        @ctx.getenv(ShopifyCli::PartnersAPI::LOCAL_DEBUG)
+      end
     end
   end
 end

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

@@ -13,20 +13,11 @@ module Node
       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)

data/lib/project_types/node/messages/messages.rb

@@ -8,6 +8,13 @@ module Node
           generic: "Error",
         },
 
+        connect: {
+          connected: "Project now connected to {{green:%s}}",
+          production_warning: <<~MESSAGE,
+          {{yellow:! Warning: if you have connected to an {{bold:app in production}}, running {{command:serve}} may update the app URL and cause an outage.
+          MESSAGE
+        },
+
         create: {
           help: <<~HELP,
           {{command:%s create node}}: Creates an embedded nodejs app.
@@ -26,12 +33,6 @@ module Node
             npm_version_failure: "Failed to get the current npm version. Please make sure it is installed as per " \
               "the instructions at https://www.npmjs.com/get-npm.",
           },
-          info: {
-            created: "{{v}} {{green:%s}} was created in your Partner Dashboard {{underline:%s}}",
-            serve: "{{*}} Change directories to your new project folder {{green:%s}} and run {{command:%s serve}} " \
-              "to start a local server",
-            install: "{{*}} Then, visit {{underline:%s/test}} to install {{green:%s}} on your Dev Store",
-          },
           node_version: "node %s",
           npm_version: "npm %s",
         },
@@ -82,52 +83,17 @@ module Node
 
         generate: {
           help: <<~HELP,
-          Generate code in your Node project. Supports generating new billing API calls, new pages, or new webhooks.
-            Usage: {{command:%s generate [ billing | page | webhook ]}}
-          HELP
-          extended_help: <<~EXAMPLES,
-          {{bold:Examples:}}
-            {{cyan:%s generate webhook PRODUCTS_CREATE}}
-              Generate and register a new webhook that will be called every time a new product is created on your store.
-          EXAMPLES
-
-          error: {
-            name_exists: "%s already exists!",
-            generic: "Error generating %s",
-          },
-
-          billing: {
-            help: <<~HELP,
-            Enable charging for your app. This command generates the necessary code to call Shopify’s billing API.
-              Usage: {{command:%s generate billing [ one-time-billing | recurring-billing ]}}
-            HELP
-            type_select: "How would you like to charge for your app?",
-            generating: "Generating %s code ...",
-            generated: "{{green:%s}} generated in server/server.js",
-          },
+          {{red:The {{command:generate}} command is no longer supported.}}
+            You can complete any tasks previously supported by {{command:generate}} with these guides:
+            {{green:page}}
+              Create a page with Polaris design components: {{green:https://shopify.dev/tutorials/build-a-shopify-app-with-node-and-react/build-your-user-interface-with-polaris}}
 
-          page: {
-            help: <<~HELP,
-            Generate a new page in your app with the specified name. New files are generated inside the project’s “/pages” directory.
-              Usage: {{command:%s generate page <pagename>}}
-            HELP
-            error: {
-              invalid_page_type: "Invalid page type.",
-            },
-            type_select: "Which template would you like to use?",
-            generating: "Generating %s page...",
-            generated: "{{green: %s}} generated in pages/%s",
-          },
+            {{green:webhook}}
+              Register and process webhooks: {{green:https://github.com/Shopify/shopify-node-api/blob/main/docs/usage/webhooks.md}}
 
-          webhook: {
-            help: <<~HELP,
-            Generate and register a new webhook that listens for the specified Shopify store event.
-              Usage: {{command:%s generate webhook <type>}}
-            HELP
-            type_select: "What type of webhook would you like to create?",
-            generating: "Generating webhook: %s",
-            generated: "{{green:%s}} generated in server/server.js",
-          },
+            {{green:billing}}
+              Create and manage app billing models: {{green:https://shopify.dev/tutorials/bill-for-your-app-using-graphql-admin-api}}
+          HELP
         },
 
         open: {

data/lib/project_types/rails/cli.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 module Rails
   class Project < ShopifyCli::ProjectType
-    creator 'Ruby on Rails App', 'Rails::Commands::Create'
+    title('Ruby on Rails App')
+    creator('Rails::Commands::Create')
+    connector('Rails::Commands::Connect')
 
     register_command('Rails::Commands::Deploy', "deploy")
     register_command('Rails::Commands::Generate', "generate")
@@ -17,6 +19,7 @@ module Rails
 
   # define/autoload project specific Commands
   module Commands
+    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')

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

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

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

@@ -27,8 +27,9 @@ module Rails
         form = Forms::Create.ask(@ctx, args, options.flags)
         return @ctx.puts(self.class.help) if form.nil?
 
+        ruby_version = Ruby.version(@ctx)
         @ctx.abort(@ctx.message('rails.create.error.invalid_ruby_version')) unless
-          Ruby.version(@ctx).satisfies?('~>2.5')
+          ruby_version.satisfies?('~>2.5') || ruby_version.satisfies?('~>3.0.0')
 
         check_node
         check_yarn
@@ -55,11 +56,13 @@ module Rails
           scopes: 'write_products,write_customers,write_draft_orders',
         ).write(@ctx)
 
-        partners_url = "https://partners.shopify.com/#{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('rails.create.info.created', form.title, partners_url))
-        @ctx.puts(@ctx.message('rails.create.info.serve', form.name, ShopifyCli::TOOL_NAME))
-        @ctx.puts(@ctx.message('rails.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
@@ -110,7 +113,7 @@ module Rails
       end
 
       def build(name, db)
-        @ctx.abort(@ctx.message('rails.create.error.install_failure', 'rails')) unless install_gem('rails')
+        @ctx.abort(@ctx.message('rails.create.error.install_failure', 'rails')) unless install_gem('rails', '<6.1')
         @ctx.abort(@ctx.message('rails.create.error.install_failure', 'bundler ~>2.0')) unless
           install_gem('bundler', '~>2.0')
 
@@ -133,18 +136,14 @@ module Rails
 
         @ctx.puts(@ctx.message('rails.create.adding_shopify_gem'))
         File.open(File.join(@ctx.root, 'Gemfile'), 'a') do |f|
-          f.puts "\ngem 'shopify_app', '>=11.3.0'"
+          f.puts "\ngem 'shopify_app', '>=17.0.3'"
         end
         CLI::UI::Frame.open(@ctx.message('rails.create.running_bundle_install')) do
           syscall(%w(bundle install))
         end
 
         CLI::UI::Frame.open(@ctx.message('rails.create.running_generator')) do
-          begin
-            syscall(%w(spring stop))
-          rescue
-          end
-          syscall(%w(rails generate shopify_app))
+          syscall(%w(rails generate shopify_app --new-shopify-cli-app))
         end
 
         CLI::UI::Frame.open(@ctx.message('rails.create.running_migrations')) do
@@ -172,6 +171,10 @@ module Rails
       def install_gem(name, version = nil)
         Gem.install(@ctx, name, version)
       end
+
+      def local_debug?
+        @ctx.getenv(ShopifyCli::PartnersAPI::LOCAL_DEBUG)
+      end
     end
   end
 end

data/lib/project_types/rails/forms/create.rb

@@ -48,7 +48,7 @@ module Rails
       def ask_db
         if db.nil?
           return 'sqlite3' unless CLI::UI::Prompt.confirm(ctx.message('rails.forms.create.db.want_select'),
-                                                          default: false)
+            default: false)
           @db = CLI::UI::Prompt.ask(ctx.message('rails.forms.create.db.select')) do |handler|
             VALID_DB_TYPES.each do |db_type|
               handler.option(ctx.message("rails.forms.create.db.select_#{db_type}")) { db_type }

data/lib/project_types/rails/gem.rb

@@ -99,7 +99,7 @@ module Rails
         # there was a specific version given during new(), so
         # check version of gem found to determine match
         require 'semantic/semantic'
-        found_version, _ = path.match(%r{/#{Regexp.quote(name)}-([\d\.]+)})&.captures
+        found_version, _ = path.match(%r{/#{Regexp.quote(name)}-(\d\.\d\.\d)})&.captures
         found_version.nil? ? false : Semantic::Version.new(found_version).satisfies?(version)
       else
         # otherwise ignore the actual version number,

data/lib/project_types/rails/messages/messages.rb

@@ -17,6 +17,13 @@ module Rails
           setting_gem_path: "GEM_PATH being set to %s",
         },
 
+        connect: {
+          connected: "Project now connected to {{green:%s}}",
+          production_warning: <<~MESSAGE,
+          {{yellow:! Warning: if you have connected to an {{bold:app in production}}, running {{command:serve}} may update the app URL and cause an outage.
+          MESSAGE
+        },
+
         create: {
           help: <<~HELP,
           {{command:%s create rails}}: Creates a ruby on rails app.
@@ -32,7 +39,7 @@ module Rails
 
           error: {
             invalid_ruby_version: <<~MSG,
-            This project requires a ruby version ~> 2.5.
+            This project requires a Ruby version ~> 2.5 or Ruby 3.0
             See {{underline:https://github.com/Shopify/shopify-app-cli/blob/master/docs/installing-ruby.md}}
             for our recommended method of installing ruby.
             MSG
@@ -48,10 +55,6 @@ module Rails
           },
 
           info: {
-            created: "{{v}} {{green:%s}} was created in your Partner Dashboard {{underline:%s}}",
-            serve: "{{*}} Change directories to your new project folder {{green:%s}} and run {{command:%s serve}} " \
-              "to start a local server",
-            install: "{{*}} Then, visit {{underline:%s/test}} to install {{green:%s}} on your Dev Store",
             open_new_shell: "{{*}} {{yellow:After installing %s, please open a new Command Prompt or PowerShell " \
               "window to continue.}}",
           },

data/lib/project_types/script/cli.rb

@@ -3,7 +3,8 @@
 module Script
   class Project < ShopifyCli::ProjectType
     hidden_feature(feature_set: :script_project)
-    creator 'Script', 'Script::Commands::Create'
+    title('Script')
+    creator('Script::Commands::Create')
 
     register_command('Script::Commands::Push', 'push')
     register_command('Script::Commands::Disable', 'disable')
@@ -41,22 +42,25 @@ module Script
     module Domain
       autoload :Errors, Project.project_filepath('layers/domain/errors')
       autoload :PushPackage, Project.project_filepath('layers/domain/push_package')
+      autoload :Metadata, Project.project_filepath('layers/domain/metadata')
       autoload :ExtensionPoint, Project.project_filepath('layers/domain/extension_point')
-      autoload :Script, Project.project_filepath('layers/domain/script')
     end
 
     module Infrastructure
       autoload :Errors, Project.project_filepath('layers/infrastructure/errors')
       autoload :AssemblyScriptDependencyManager,
-               Project.project_filepath('layers/infrastructure/assemblyscript_dependency_manager')
+        Project.project_filepath('layers/infrastructure/assemblyscript_dependency_manager')
       autoload :AssemblyScriptProjectCreator,
-               Project.project_filepath('layers/infrastructure/assemblyscript_project_creator')
+        Project.project_filepath('layers/infrastructure/assemblyscript_project_creator')
       autoload :AssemblyScriptTaskRunner, Project.project_filepath('layers/infrastructure/assemblyscript_task_runner')
       autoload :AssemblyScriptTsConfig, Project.project_filepath('layers/infrastructure/assemblyscript_tsconfig')
+      autoload :RustProjectCreator,
+        Project.project_filepath('layers/infrastructure/rust_project_creator.rb')
+      autoload :RustTaskRunner, Project.project_filepath('layers/infrastructure/rust_task_runner')
+
       autoload :PushPackageRepository, Project.project_filepath('layers/infrastructure/push_package_repository')
       autoload :ExtensionPointRepository, Project.project_filepath('layers/infrastructure/extension_point_repository')
       autoload :ProjectCreator, Project.project_filepath('layers/infrastructure/project_creator')
-      autoload :ScriptRepository, Project.project_filepath('layers/infrastructure/script_repository')
       autoload :ScriptService, Project.project_filepath('layers/infrastructure/script_service')
       autoload :TaskRunner, Project.project_filepath('layers/infrastructure/task_runner')
     end

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

@@ -5,25 +5,27 @@ module Script
     class Create < ShopifyCli::SubCommand
       options do |parser, flags|
         parser.on('--name=NAME') { |name| flags[:name] = name }
+        parser.on('--description=DESCRIPTION') { |description| flags[:description] = description }
         parser.on('--extension_point=EP_NAME') { |ep_name| flags[:extension_point] = ep_name }
+        parser.on('--language=LANGUAGE') { |language| flags[:language] = language }
       end
 
       def call(args, _name)
-        language = 'ts'
         cur_dir = @ctx.root
 
         form = Forms::Create.ask(@ctx, args, options.flags)
         return @ctx.puts(self.class.help) if form.nil?
 
-        unless !form.name.empty? && form.extension_point && ScriptProject::SUPPORTED_LANGUAGES.include?(language)
+        unless !form.name.empty? && form.extension_point && form.language
           return @ctx.puts(self.class.help)
         end
 
         project = Layers::Application::CreateScript.call(
           ctx: @ctx,
-          language: language,
+          language: form.language,
           script_name: form.name,
-          extension_point_type: form.extension_point
+          extension_point_type: form.extension_point,
+          description: form.description
         )
         @ctx.puts(@ctx.message('script.create.change_directory_notice', project.script_name))
       rescue Script::Errors::ScriptProjectAlreadyExistsError => e

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

@@ -4,9 +4,7 @@ module Script
   module Commands
     class Enable < ShopifyCli::Command
       options do |parser, flags|
-        parser.on('--config_props=KEYVALUEPAIRS', Array) do |t|
-          flags[:config_props] = Hash[t.map { |s| s.split(':') }]
-        end
+        parser.on('--config_props=KEYVALUEPAIRS', Array) { |t| flags[:config_props] = t }
         parser.on('--config_file=CONFIGFILEPATH') { |t| flags[:config_file] = t }
       end
 
@@ -47,7 +45,7 @@ module Script
       def acquire_configuration(config_file: nil, config_props: nil)
         properties = {}
         properties = YAML.load(File.read(config_file)) unless config_file.nil?
-        properties = properties.merge(config_props) unless config_props.nil?
+        properties = properties.merge(parse_config_props(config_props)) unless config_props.nil?
 
         configuration = { entries: [] }
         properties.each do |key, value|
@@ -61,6 +59,16 @@ module Script
         raise Errors::InvalidConfigYAMLError, options.flags[:config_file]
       end
 
+      def parse_config_props(config_props)
+        Hash[
+          config_props.map do |s|
+            args = s.split(':').map(&:strip)
+            raise Errors::InvalidConfigProps unless args.size == 2
+            args
+          end
+        ]
+      end
+
       # No slice pre Ruby 2.5 so roll our own
       def slice(hash, *keys)
         Hash[hash.to_a - hash.select { |key, _value| !keys.include?(key) }.to_a]

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

@@ -9,19 +9,11 @@ module Script
 
       def call(_args, _name)
         ShopifyCli::Tasks::EnsureEnv.call(@ctx, required: [:api_key, :secret, :shop])
-        project = ScriptProject.current
-        api_key = project.env[:api_key]
-        return @ctx.puts(self.class.help) unless api_key &&
-          ScriptProject::SUPPORTED_LANGUAGES.include?(project.language)
-        Layers::Application::PushScript.call(
-          ctx: @ctx,
-          language: project.language,
-          extension_point_type: project.extension_point_type,
-          script_name: project.script_name,
-          source_file: project.source_file,
-          api_key: api_key,
-          force: options.flags.key?(:force)
-        )
+
+        api_key = ScriptProject.current.api_key
+        return @ctx.puts(self.class.help) unless api_key
+
+        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
         UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message('script.push.error.operation_failed'))