shopify-cli 1.5.0 → 1.6.0

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

@@ -83,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/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
@@ -59,7 +60,9 @@ module Rails
 
         @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))
-        @ctx.puts(@ctx.message('apps.create.info.install', partners_url, form.title))
+        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

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

@@ -39,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

data/lib/project_types/script/cli.rb

@@ -42,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/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'))

data/lib/project_types/script/config/extension_points.yml

@@ -1,25 +1,29 @@
 discount:
+  deprecated: true
   assemblyscript:
     package: "@shopify/extension-point-as-discount"
     sdk-version: "^7.0.0"
-    toolchain-version: "^2.0.1"
+    toolchain-version: "^4.0.0"
 unit_limit_per_order:
   assemblyscript:
     package: "@shopify/extension-point-as-unit-limit-per-order"
     sdk-version: "^7.0.0"
-    toolchain-version: "^2.0.1"
+    toolchain-version: "^4.0.0"
 payment_filter:
   assemblyscript:
     package: "@shopify/extension-point-as-payment-filter"
     sdk-version: "^7.0.0"
-    toolchain-version: "^2.0.1"
+    toolchain-version: "^4.0.0"
+  rust:
+    beta: true
+    package: "https://github.com/Shopify/scripts-apis-rs"
 shipping_filter:
   assemblyscript:
     package: "@shopify/extension-point-as-shipping-filter"
     sdk-version: "^7.0.0"
-    toolchain-version: "^2.0.1"
+    toolchain-version: "^4.0.0"
 tax_filter:
   assemblyscript:
     package: "@shopify/extension-point-as-tax-filter"
     sdk-version: "^7.0.0"
-    toolchain-version: "^2.0.1"
+    toolchain-version: "^4.0.0"

data/lib/project_types/script/errors.rb

@@ -25,5 +25,22 @@ module Script
         @config_file = config_file
       end
     end
+
+    class InvalidLanguageError < ScriptProjectError
+      attr_reader :language, :extension_point_type
+      def initialize(language, extension_point_type)
+        super()
+        @language = language
+        @extension_point_type = extension_point_type
+      end
+    end
+
+    class DeprecatedEPError < ScriptProjectError
+      attr_reader :ep
+      def initialize(ep)
+        super()
+        @ep = ep
+      end
+    end
   end
 end

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

@@ -3,11 +3,13 @@
 module Script
   module Forms
     class Create < ShopifyCli::Form
-      flag_arguments :extension_point, :name
+      flag_arguments :extension_point, :name, :language, :description
 
       def ask
         self.name = valid_name
+        self.description ||= ask_description
         self.extension_point ||= ask_extension_point
+        self.language = ask_language
       end
 
       private
@@ -15,7 +17,7 @@ module Script
       def ask_extension_point
         CLI::UI::Prompt.ask(
           @ctx.message('script.forms.create.select_extension_point'),
-          options: Script::Layers::Application::ExtensionPoints.types
+          options: Layers::Application::ExtensionPoints.non_deprecated_types
         )
       end
 
@@ -23,11 +25,33 @@ module Script
         CLI::UI::Prompt.ask(@ctx.message('script.forms.create.script_name'))
       end
 
+      def ask_description
+        CLI::UI::Prompt.ask(@ctx.message('script.forms.create.description'))
+      end
+
       def valid_name
         n = (name || ask_name).downcase.gsub(' ', '_')
         return n if n.match?(/^[0-9A-Za-z_-]*$/)
         raise Errors::InvalidScriptNameError
       end
+
+      def ask_language
+        if language
+          if Layers::Application::ExtensionPoints.supported_language?(type: extension_point, language: language)
+            return language.downcase
+          else
+            raise Errors::InvalidLanguageError.new(language, extension_point)
+          end
+        end
+
+        all_languages = Layers::Application::ExtensionPoints.languages(type: extension_point)
+        return all_languages.first if all_languages.count == 1
+
+        CLI::UI::Prompt.ask(
+          ctx.message('script.forms.create.select_language'),
+          options: all_languages
+        )
+      end
     end
   end
 end

data/lib/project_types/script/graphql/app_script_update_or_create.graphql

@@ -1,16 +1,24 @@
 mutation AppScriptUpdateOrCreate(
   $extensionPointName: ExtensionPointName!,
   $title: String,
+  $description: String,
   $sourceCode: String,
   $language: String,
-  $force: Boolean
+  $force: Boolean,
+  $schemaMajorVersion: String,
+  $schemaMinorVersion: String,
+  $useMsgpack: Boolean
 ) {
   appScriptUpdateOrCreate(
     extensionPointName: $extensionPointName
     title: $title
+    description: $description
     sourceCode: $sourceCode
     language: $language
     force: $force
+    schemaMajorVersion: $schemaMajorVersion
+    schemaMinorVersion: $schemaMinorVersion
+    useMsgpack: $useMsgpack
 ) {
     userErrors {
       field
@@ -22,6 +30,7 @@ mutation AppScriptUpdateOrCreate(
       configSchema
       extensionPointName
       title
+      description
     }
   }
 }

data/lib/project_types/script/layers/application/build_script.rb

@@ -5,13 +5,18 @@ module Script
     module Application
       class BuildScript
         class << self
-          def call(ctx:, task_runner:, script:)
+          def call(ctx:, task_runner:, script_name:, description:, extension_point_type:)
             CLI::UI::Frame.open(ctx.message('script.application.building')) do
               begin
                 UI::StrictSpinner.spin(ctx.message('script.application.building_script')) do |spinner|
-                  Infrastructure::PushPackageRepository
-                    .new(ctx: ctx)
-                    .create_push_package(script, task_runner.build, task_runner.compiled_type)
+                  Infrastructure::PushPackageRepository.new(ctx: ctx).create_push_package(
+                    extension_point_type: extension_point_type,
+                    script_name: script_name,
+                    description: description,
+                    script_content: task_runner.build,
+                    compiled_type: task_runner.compiled_type,
+                    metadata: task_runner.metadata
+                  )
                   spinner.update_title(ctx.message('script.application.built'))
                 end
               rescue StandardError => e

data/lib/project_types/script/layers/application/create_script.rb

@@ -7,40 +7,42 @@ module Script
     module Application
       class CreateScript
         class << self
-          def call(ctx:, language:, script_name:, extension_point_type:)
+          def call(ctx:, language:, script_name:, extension_point_type:, description:)
             extension_point = ExtensionPoints.get(type: extension_point_type)
-            project = setup_project(ctx, script_name, extension_point)
+            project = setup_project(ctx, language, script_name, extension_point, description)
             project_creator = Infrastructure::ProjectCreator
               .for(ctx, language, extension_point, script_name, project.directory)
-            install_dependencies(ctx, language, script_name, project.source_file, project_creator)
-            bootstrap(ctx, project.source_path, project_creator)
+            install_dependencies(ctx, language, script_name, project_creator)
+            bootstrap(ctx, project_creator)
             project
           end
 
           private
 
-          def setup_project(ctx, script_name, extension_point)
+          def setup_project(ctx, language, script_name, extension_point, description)
             ScriptProject.create(ctx, script_name)
             ScriptProject.write(
               ctx,
               project_type: :script,
               organization_id: nil, # TODO: can you provide this at creation
               extension_point_type: extension_point.type,
-              script_name: script_name
+              script_name: script_name,
+              language: language,
+              description: description
             )
             ScriptProject.current
           end
 
-          def install_dependencies(ctx, language, script_name, source_file, project_creator)
-            task_runner = Infrastructure::TaskRunner.for(ctx, language, script_name, source_file)
+          def install_dependencies(ctx, language, script_name, project_creator)
+            task_runner = Infrastructure::TaskRunner.for(ctx, language, script_name)
             project_creator.setup_dependencies
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
           end
 
-          def bootstrap(ctx, source_path, project_creator)
+          def bootstrap(ctx, project_creator)
             UI::StrictSpinner.spin(ctx.message('script.create.creating')) do |spinner|
               project_creator.bootstrap
-              spinner.update_title(ctx.message('script.create.created', source_path))
+              spinner.update_title(ctx.message('script.create.created'))
             end
           end
         end