shopify-cli 2.2.1 → 2.5.0

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

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 module Rails
   class Command
-    class Connect < ShopifyCli::SubCommand
+    class Connect < ShopifyCLI::SubCommand
       prerequisite_task ensure_project_type: :rails
 
       def call(*)
-        if ShopifyCli::Project.has_current? && ShopifyCli::Project.current.env
+        if ShopifyCLI::Project.has_current? && ShopifyCLI::Project.current.env
           @ctx.puts(@ctx.message("rails.connect.production_warning"))
         end
 
-        app = ShopifyCli::Connect.new(@ctx).default_connect("rails")
+        app = ShopifyCLI::Connect.new(@ctx).default_connect("rails")
         @ctx.done(@ctx.message("rails.connect.connected", app))
       end
 
       def self.help
-        ShopifyCli::Context.message("rails.connect.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("rails.connect.help", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
       end
     end
   end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Rails
   class Command
-    class Create < ShopifyCli::SubCommand
+    class Create < ShopifyCLI::SubCommand
       prerequisite_task :ensure_authenticated
 
       USER_AGENT_CODE = <<~USERAGENT
@@ -43,37 +43,37 @@ module Rails
 
         build(form.name, form.db)
         set_custom_ua
-        ShopifyCli::Project.write(
+        ShopifyCLI::Project.write(
           @ctx,
           project_type: "rails",
           organization_id: form.organization_id,
         )
 
-        api_client = ShopifyCli::Tasks::CreateApiClient.call(
+        api_client = ShopifyCLI::Tasks::CreateApiClient.call(
           @ctx,
           org_id: form.organization_id,
           title: form.title,
           type: form.type,
         )
 
-        ShopifyCli::Resources::EnvFile.new(
+        ShopifyCLI::Resources::EnvFile.new(
           api_key: api_client["apiKey"],
           secret: api_client["apiSecretKeys"].first["secret"],
           shop: form.shop_domain,
           scopes: "write_products,write_customers,write_draft_orders",
         ).write(@ctx)
 
-        partners_url = ShopifyCli::PartnersAPI.partners_url_for(form.organization_id, api_client["id"], local_debug?)
+        partners_url = ShopifyCLI::PartnersAPI.partners_url_for(form.organization_id, api_client["id"])
 
         @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, "rails"))
-        unless ShopifyCli::Shopifolk.acting_as_shopify_organization?
+        @ctx.puts(@ctx.message("apps.create.info.serve", form.name, ShopifyCLI::TOOL_NAME, "rails"))
+        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("rails.create.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("rails.create.help", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
       end
 
       private
@@ -84,7 +84,7 @@ module Rails
           @ctx.abort(@ctx.message("rails.create.error.node_required")) unless @ctx.windows?
           @ctx.puts("{{x}} {{red:" + @ctx.message("rails.create.error.node_required") + "}}")
           @ctx.puts(@ctx.message("rails.create.info.open_new_shell", "node"))
-          raise ShopifyCli::AbortSilent
+          raise ShopifyCLI::AbortSilent
         end
 
         version, stat = @ctx.capture2e("node", "-v")
@@ -93,7 +93,7 @@ module Rails
           # execution stops above if not Windows
           @ctx.puts("{{x}} {{red:" + @ctx.message("rails.create.error.node_version_failure") + "}}")
           @ctx.puts(@ctx.message("rails.create.info.open_new_shell", "node"))
-          raise ShopifyCli::AbortSilent
+          raise ShopifyCLI::AbortSilent
         end
 
         @ctx.done(@ctx.message("rails.create.node_version", version))
@@ -105,7 +105,7 @@ module Rails
           @ctx.abort(@ctx.message("rails.create.error.yarn_required")) unless @ctx.windows?
           @ctx.puts("{{x}} {{red:" + @ctx.message("rails.create.error.yarn_required") + "}}")
           @ctx.puts(@ctx.message("rails.create.info.open_new_shell", "yarn"))
-          raise ShopifyCli::AbortSilent
+          raise ShopifyCLI::AbortSilent
         end
 
         version, stat = @ctx.capture2e("yarn", "-v")
@@ -113,7 +113,7 @@ module Rails
           @ctx.abort(@ctx.message("rails.create.error.yarn_version_failure")) unless @ctx.windows?
           @ctx.puts("{{x}} {{red:" + @ctx.message("rails.create.error.yarn_version_failure") + "}}")
           @ctx.puts(@ctx.message("rails.create.info.open_new_shell", "yarn"))
-          raise ShopifyCli::AbortSilent
+          raise ShopifyCLI::AbortSilent
         end
 
         @ctx.done(@ctx.message("rails.create.yarn_version", version))
@@ -178,10 +178,6 @@ 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/commands/deploy/heroku.rb

@@ -9,7 +9,7 @@ module Rails
           DB_CHECK_CMD = 'bundle exec rails runner "puts ActiveRecord::Base.connection.adapter_name.downcase"'
 
           def help
-            ShopifyCli::Context.message("rails.deploy.heroku.help", ShopifyCli::TOOL_NAME)
+            ShopifyCLI::Context.message("rails.deploy.heroku.help", ShopifyCLI::TOOL_NAME)
           end
 
           def start(ctx)
@@ -23,7 +23,7 @@ module Rails
             end
 
             spin_group = CLI::UI::SpinGroup.new
-            heroku_service = ShopifyCli::Heroku.new(ctx)
+            heroku_service = ShopifyCLI::Heroku.new(ctx)
 
             spin_group.add(ctx.message("rails.deploy.heroku.downloading")) do |spinner|
               heroku_service.download
@@ -36,7 +36,7 @@ module Rails
               spinner.update_title(ctx.message("rails.deploy.heroku.installed"))
             end
             spin_group.add(ctx.message("rails.deploy.heroku.git.checking")) do |spinner|
-              ShopifyCli::Git.init(ctx)
+              ShopifyCLI::Git.init(ctx)
               spinner.update_title(ctx.message("rails.deploy.heroku.git.initialized"))
             end
             spin_group.wait
@@ -78,7 +78,7 @@ module Rails
               end
             end
 
-            branches = ShopifyCli::Git.branches(ctx)
+            branches = ShopifyCLI::Git.branches(ctx)
             if branches.length == 1
               branch_to_deploy = branches[0]
               ctx.puts(ctx.message("rails.deploy.heroku.git.branch_selected", branch_to_deploy))

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

@@ -3,7 +3,7 @@ require "shopify_cli"
 
 module Rails
   class Command
-    class Deploy < ShopifyCli::SubCommand
+    class Deploy < ShopifyCLI::SubCommand
       prerequisite_task ensure_project_type: :rails
 
       autoload :Heroku, Project.project_filepath("commands/deploy/heroku")
@@ -21,11 +21,11 @@ module Rails
       end
 
       def self.help
-        ShopifyCli::Context.message("rails.deploy.help", ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("rails.deploy.help", ShopifyCLI::TOOL_NAME)
       end
 
       def self.extended_help
-        ShopifyCli::Context.message("rails.deploy.extended_help", ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("rails.deploy.extended_help", ShopifyCLI::TOOL_NAME)
       end
     end
   end

data/lib/project_types/rails/commands/generate/webhook.rb

@@ -7,7 +7,7 @@ module Rails
         class << self
           def start(ctx, args)
             selected_type = args.first
-            schema = ShopifyCli::AdminAPI::Schema.get(ctx)
+            schema = ShopifyCLI::AdminAPI::Schema.get(ctx)
             webhooks = schema.get_names_from_type("WebhookSubscriptionTopic")
             unless selected_type && webhooks.include?(selected_type)
               selected_type = CLI::UI::Prompt.ask(ctx.message("rails.generate.webhook.select")) do |handler|
@@ -25,12 +25,12 @@ module Rails
           end
 
           def help
-            ShopifyCli::Context.message("rails.generate.webhook.help", ShopifyCli::TOOL_NAME)
+            ShopifyCLI::Context.message("rails.generate.webhook.help", ShopifyCLI::TOOL_NAME)
           end
 
           def generate_command(selected_type, ctx)
             parts = selected_type.downcase.split("_")
-            host = ShopifyCli::Project.current.env.host
+            host = ShopifyCLI::Project.current.env.host
             selected_type = parts[0..-2].join("_") + "/" + parts[-1]
             command = ctx.windows? ? "ruby bin\\rails" : "bin/rails"
             "#{command} g shopify_app:add_webhook -t #{selected_type} -a #{host}/webhooks/#{selected_type.downcase}"

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

@@ -3,7 +3,7 @@ require "shopify_cli"
 
 module Rails
   class Command
-    class Generate < ShopifyCli::SubCommand
+    class Generate < ShopifyCLI::SubCommand
       prerequisite_task ensure_project_type: :rails
 
       autoload :Webhook, Project.project_filepath("commands/generate/webhook")
@@ -21,7 +21,7 @@ module Rails
       end
 
       def self.help
-        ShopifyCli::Context.message("rails.generate.help", ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("rails.generate.help", ShopifyCLI::TOOL_NAME)
       end
 
       def self.extended_help
@@ -34,7 +34,7 @@ module Rails
           end
           extended_help += "\n"
         end
-        extended_help += ShopifyCli::Context.message("rails.generate.extended_help", ShopifyCli::TOOL_NAME)
+        extended_help += ShopifyCLI::Context.message("rails.generate.extended_help", ShopifyCLI::TOOL_NAME)
       end
 
       def self.run_generate(script, name, ctx)

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

@@ -2,16 +2,16 @@ require "shopify_cli"
 
 module Rails
   class Command
-    class Open < ShopifyCli::SubCommand
+    class Open < ShopifyCLI::SubCommand
       prerequisite_task ensure_project_type: :rails
 
       def call(*)
-        project = ShopifyCli::Project.current
+        project = ShopifyCLI::Project.current
         @ctx.open_url!("#{project.env.host}/login?shop=#{project.env.shop}")
       end
 
       def self.help
-        ShopifyCli::Context.message("rails.open.help", ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("rails.open.help", ShopifyCLI::TOOL_NAME)
       end
     end
   end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Rails
   class Command
-    class Serve < ShopifyCli::SubCommand
+    class Serve < ShopifyCLI::SubCommand
       prerequisite_task ensure_project_type: :rails
       prerequisite_task :ensure_env, :ensure_dev_store
 
@@ -12,11 +12,11 @@ module Rails
       end
 
       def call(*)
-        project = ShopifyCli::Project.current
-        url = options.flags[:host] || ShopifyCli::Tunnel.start(@ctx)
+        project = ShopifyCLI::Project.current
+        url = options.flags[:host] || ShopifyCLI::Tunnel.start(@ctx)
         @ctx.abort(@ctx.message("rails.serve.error.host_must_be_https")) if url.match(/^https/i).nil?
         project.env.update(@ctx, :host, url)
-        ShopifyCli::Tasks::UpdateDashboardURLS.call(
+        ShopifyCLI::Tasks::UpdateDashboardURLS.call(
           @ctx,
           url: url,
           callback_url: "/auth/shopify/callback",
@@ -28,9 +28,9 @@ module Rails
         end
 
         CLI::UI::Frame.open(@ctx.message("rails.serve.running_server")) do
-          env = ShopifyCli::Project.current.env.to_h
+          env = ShopifyCLI::Project.current.env.to_h
           env.delete("HOST")
-          env["PORT"] = ShopifyCli::Tunnel::PORT.to_s
+          env["PORT"] = ShopifyCLI::Tunnel::PORT.to_s
           env["GEM_PATH"] = Gem.gem_path(@ctx)
           if @ctx.windows?
             @ctx.system("ruby bin\\rails server", env: env)
@@ -41,11 +41,11 @@ module Rails
       end
 
       def self.help
-        ShopifyCli::Context.message("rails.serve.help", ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("rails.serve.help", ShopifyCLI::TOOL_NAME)
       end
 
       def self.extended_help
-        ShopifyCli::Context.message("rails.serve.extended_help", ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("rails.serve.extended_help", ShopifyCLI::TOOL_NAME)
       end
     end
   end

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

@@ -4,7 +4,7 @@ require "shopify_cli"
 
 module Rails
   class Command
-    class Tunnel < ShopifyCli::SubCommand
+    class Tunnel < ShopifyCLI::SubCommand
       # subcommands :auth, :start, :stop
 
       prerequisite_task ensure_project_type: :rails
@@ -18,23 +18,23 @@ module Rails
             @ctx.puts(@ctx.message("rails.tunnel.error.token_argument_missing"))
             @ctx.puts("#{self.class.help}\n#{self.class.extended_help}")
           else
-            ShopifyCli::Tunnel.auth(@ctx, token)
+            ShopifyCLI::Tunnel.auth(@ctx, token)
           end
         when "start"
-          ShopifyCli::Tunnel.start(@ctx)
+          ShopifyCLI::Tunnel.start(@ctx)
         when "stop"
-          ShopifyCli::Tunnel.stop(@ctx)
+          ShopifyCLI::Tunnel.stop(@ctx)
         else
           @ctx.puts(self.class.help)
         end
       end
 
       def self.help
-        ShopifyCli::Context.message("rails.tunnel.help", ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("rails.tunnel.help", ShopifyCLI::TOOL_NAME)
       end
 
       def self.extended_help
-        ShopifyCli::Context.message("rails.tunnel.extended_help", ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("rails.tunnel.extended_help", ShopifyCLI::TOOL_NAME)
       end
     end
   end

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

@@ -2,7 +2,7 @@ require "uri"
 
 module Rails
   module Forms
-    class Create < ShopifyCli::Form
+    class Create < ShopifyCLI::Form
       attr_accessor :name
       flag_arguments :title, :organization_id, :shop_domain, :type, :db
       VALID_DB_TYPES = ["sqlite3",
@@ -22,7 +22,7 @@ module Rails
         self.title ||= CLI::UI::Prompt.ask(ctx.message("rails.forms.create.app_name"))
         self.name = format_name
         self.type = ask_type
-        res = ShopifyCli::Tasks::SelectOrgAndShop.call(ctx, organization_id: organization_id, shop_domain: shop_domain)
+        res = ShopifyCLI::Tasks::SelectOrgAndShop.call(ctx, organization_id: organization_id, shop_domain: shop_domain)
         self.organization_id = res[:organization_id]
         self.shop_domain = res[:shop_domain]
         self.db = ask_db
@@ -48,7 +48,7 @@ module Rails
           end
         end
 
-        unless ShopifyCli::Tasks::CreateApiClient::VALID_APP_TYPES.include?(type)
+        unless ShopifyCLI::Tasks::CreateApiClient::VALID_APP_TYPES.include?(type)
           ctx.abort(ctx.message("rails.forms.create.error.invalid_app_type", type))
         end
         ctx.puts(ctx.message("rails.forms.create.app_type.selected", type))

data/lib/project_types/rails/gem.rb

@@ -5,7 +5,7 @@ module Rails
   class Gem
     include SmartProperties
 
-    property :ctx, accepts: ShopifyCli::Context, required: true
+    property :ctx, accepts: ShopifyCLI::Context, required: true
     property :name, converts: :to_s, required: true
     property :version, converts: :to_s
 

data/lib/project_types/rails/ruby.rb

@@ -4,7 +4,7 @@ module Rails
 
     VERSION_STRING = /ruby ([\d\.]+)/
 
-    property :ctx, accepts: ShopifyCli::Context, required: true
+    property :ctx, accepts: ShopifyCLI::Context, required: true
 
     class << self
       def version(ctx)

data/lib/project_types/script/cli.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Script
-  class Project < ShopifyCli::ProjectType
+  class Project < ShopifyCLI::ProjectType
     hidden_feature(feature_set: :script_project)
 
     require Project.project_filepath("messages/messages")
@@ -9,12 +9,12 @@ module Script
   end
 
   # define/autoload project specific Commands
-  class Command < ShopifyCli::ProjectCommands
+  class Command < ShopifyCLI::ProjectCommands
     hidden_feature(feature_set: :script_project)
     subcommand :Create, "create", Project.project_filepath("commands/create")
     subcommand :Push, "push", Project.project_filepath("commands/push")
   end
-  ShopifyCli::Commands.register("Script::Command", "script")
+  ShopifyCLI::Commands.register("Script::Command", "script")
 
   # define/autoload project specific Forms
   module Forms
@@ -51,6 +51,8 @@ module Script
       autoload :ExtensionPointRepository, Project.project_filepath("layers/infrastructure/extension_point_repository")
       autoload :ScriptProjectRepository, Project.project_filepath("layers/infrastructure/script_project_repository")
       autoload :ScriptService, Project.project_filepath("layers/infrastructure/script_service")
+      autoload :ScriptUploader, Project.project_filepath("layers/infrastructure/script_uploader")
+      autoload :ServiceLocator, Project.project_filepath("layers/infrastructure/service_locator")
 
       module Languages
         autoload :AssemblyScriptProjectCreator,
@@ -63,6 +65,13 @@ module Script
         autoload :RustTaskRunner, Project.project_filepath("layers/infrastructure/languages/rust_task_runner")
         autoload :TaskRunner, Project.project_filepath("layers/infrastructure/languages/task_runner")
       end
+
+      module ApiClients
+        autoload :PartnersProxyApiClient,
+          Project.project_filepath("layers/infrastructure/api_clients/partners_proxy_api_client")
+        autoload :ScriptServiceApiClient,
+          Project.project_filepath("layers/infrastructure/api_clients/script_service_api_client")
+      end
     end
   end
 

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

@@ -2,7 +2,7 @@
 
 module Script
   class Command
-    class Create < ShopifyCli::SubCommand
+    class Create < ShopifyCLI::SubCommand
       prerequisite_task :ensure_authenticated
 
       options do |parser, flags|
@@ -35,7 +35,7 @@ module Script
 
       def self.help
         allowed_values = Script::Layers::Application::ExtensionPoints.available_types.map { |type| "{{cyan:#{type}}}" }
-        ShopifyCli::Context.message("script.create.help", ShopifyCli::TOOL_NAME, allowed_values.join(", "))
+        ShopifyCLI::Context.message("script.create.help", ShopifyCLI::TOOL_NAME, allowed_values.join(", "))
       end
     end
   end

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

@@ -2,7 +2,7 @@
 
 module Script
   class Command
-    class Push < ShopifyCli::SubCommand
+    class Push < ShopifyCLI::SubCommand
       prerequisite_task ensure_project_type: :script
 
       options do |parser, flags|
@@ -28,7 +28,7 @@ module Script
       end
 
       def self.help
-        ShopifyCli::Context.message("script.push.help", ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("script.push.help", ShopifyCLI::TOOL_NAME)
       end
     end
   end

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

@@ -2,7 +2,7 @@
 
 module Script
   module Forms
-    class Create < ShopifyCli::Form
+    class Create < ShopifyCLI::Form
       flag_arguments :extension_point, :name, :language
 
       def ask

data/lib/project_types/script/graphql/app_script_set.graphql

@@ -0,0 +1,40 @@
+mutation AppScriptSet(
+  $uuid: String
+  $extensionPointName: ExtensionPointName!,
+  $title: String!,
+  $description: String,
+  $force: Boolean,
+  $schemaMajorVersion: String,
+  $schemaMinorVersion: String,
+  $scriptJsonVersion: String!,
+  $configurationUi: Boolean!,
+  $configurationDefinition: String!,
+  $moduleUploadUrl: String!,
+) {
+  appScriptSet(
+    uuid: $uuid
+    extensionPointName: $extensionPointName
+    title: $title
+    description: $description
+    force: $force
+    schemaMajorVersion: $schemaMajorVersion
+    schemaMinorVersion: $schemaMinorVersion,
+    scriptJsonVersion: $scriptJsonVersion,
+    configurationUi: $configurationUi,
+    configurationDefinition: $configurationDefinition,
+    moduleUploadUrl: $moduleUploadUrl,
+) {
+    userErrors {
+      field
+      message
+      tag
+    }
+    appScript {
+      uuid
+      appKey
+      configSchema
+      extensionPointName
+      title
+    }
+  }
+}

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

@@ -1,44 +0,0 @@
-mutation AppScriptUpdateOrCreate(
-  $extensionPointName: ExtensionPointName!,
-  $title: String,
-  $description: String,
-  $sourceCode: String,
-  $language: String,
-  $force: Boolean,
-  $schemaMajorVersion: String,
-  $schemaMinorVersion: String,
-  $useMsgpack: Boolean,
-  $uuid: String,
-  $configurationUi: Boolean!,
-  $scriptJsonVersion: String!,
-  $configurationDefinition: String!,
-) {
-  appScriptUpdateOrCreate(
-    extensionPointName: $extensionPointName
-    title: $title
-    description: $description
-    sourceCode: $sourceCode
-    language: $language
-    force: $force
-    schemaMajorVersion: $schemaMajorVersion
-    schemaMinorVersion: $schemaMinorVersion
-    useMsgpack: $useMsgpack,
-    uuid: $uuid
-    configurationUi: $configurationUi
-    scriptJsonVersion: $scriptJsonVersion
-    configurationDefinition: $configurationDefinition
-) {
-    userErrors {
-      field
-      message
-      tag
-    }
-    appScript {
-      uuid
-      appKey
-      configSchema
-      extensionPointName
-      title
-    }
-  }
-}

data/lib/project_types/script/graphql/module_upload_url_generate.graphql

@@ -0,0 +1,9 @@
+mutation moduleUploadUrlGenerate {
+  moduleUploadUrlGenerate {
+    url
+    userErrors {
+      field
+      message
+    }
+  }
+}

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

@@ -15,7 +15,7 @@ module Script
         def self.available_types
           Infrastructure::ExtensionPointRepository.new.extension_points.select do |ep|
             next false if ep.deprecated?
-            !ep.beta? || ShopifyCli::Feature.enabled?(:scripts_beta_extension_points)
+            !ep.beta? || ShopifyCLI::Feature.enabled?(:scripts_beta_extension_points)
           end.map(&:type)
         end
 
@@ -28,7 +28,7 @@ module Script
 
         def self.languages(type:)
           get(type: type).sdks.all.map do |sdk|
-            next nil if sdk.beta? && !ShopifyCli::Feature.enabled?(:scripts_beta_languages)
+            next nil if sdk.beta? && !ShopifyCLI::Feature.enabled?(:scripts_beta_languages)
             sdk.class.language
           end.compact
         end

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

@@ -20,7 +20,19 @@ module Script
                 compiled_type: task_runner.compiled_type,
                 metadata: task_runner.metadata,
               )
-              uuid = package.push(Infrastructure::ScriptService.new(ctx: p_ctx), script_project.api_key, force)
+              script_service = Infrastructure::ServiceLocator.script_service(
+                ctx: p_ctx,
+                api_key: script_project.api_key
+              )
+              module_upload_url = Infrastructure::ScriptUploader.new(script_service).upload(package.script_content)
+              uuid = script_service.set_app_script(
+                uuid: package.uuid,
+                extension_point_type: package.extension_point_type,
+                force: force,
+                metadata: package.metadata,
+                script_json: package.script_json,
+                module_upload_url: module_upload_url,
+              )
               script_project_repo.update_env(uuid: uuid)
               spinner.update_title(p_ctx.message("script.application.pushed"))
             end

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

@@ -17,7 +17,7 @@ module Script
           uuid:,
           extension_point_type:,
           script_content:,
-          compiled_type:,
+          compiled_type: nil,
           metadata:,
           script_json:
         )
@@ -29,19 +29,6 @@ module Script
           @metadata = metadata
           @script_json = script_json
         end
-
-        def push(script_service, api_key, force)
-          script_service.push(
-            uuid: @uuid,
-            extension_point_type: @extension_point_type,
-            script_content: @script_content,
-            compiled_type: @compiled_type,
-            api_key: api_key,
-            force: force,
-            metadata: @metadata,
-            script_json: @script_json,
-          )
-        end
       end
     end
   end