shopify-cli 2.8.0 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44313f65cde9217bac879066a57be593752c7d791d272d1ada078bc4a876f24c
-  data.tar.gz: bcb6ac1b939ee13ccec83eb74814ceddb1cb2d11661f516327ca2f0d294795a3
+  metadata.gz: 0cd807b7755484c50b506a5b4af90072b08ac0f9fc2aaff6c684f0fe5e6b63cc
+  data.tar.gz: 76aaf43ba5f6af3a6c9ed5f2f73b0d79cb03261d544602996b9563cd45f4b572
 SHA512:
-  metadata.gz: 77f0ea5bef5ce778e87c9414c4ec1712795ef144e603bf22f88975d5f86dab2f4d43052522f18302be1ac836b3b2b98cb2f66ea9d413d93214da365895d3a2b5
-  data.tar.gz: 7cc5de0ba35117ae63a6cbb9e6d761695a75166cb15a996fd6545ba981e1809f60e9e42ad2d13e59a837310b11328b693744eb9547e90a0a8f537fd6640ba206
+  metadata.gz: 407ad8f61eebbfcfbf4c6099eef78a41544ed95002cf7f91fbd9cd56aa473cc1ab6ea323812032c3f21d09760bdcd824908ce9ba1f069ed492997b0cdf3d5853
+  data.tar.gz: 91ae64882ee0e7969bf93697dda900fb812009df58eeff176833e3e609e51f37fa67f418c1b80be670f852a6594308fc0e89e43a477105b316943827f80ad780

data/.github/ISSUE_TEMPLATE.md

@@ -1,3 +1,21 @@
+<!--
+
+Hi! 👋 Thanks for taking the time to open an issue.
+
+BEFORE SUBMITTING YOUR ISSUE, please ensure that:
+
+1. You've searched the existing issues to see if someone else has already submitted the same thing. You can access the list at: https://github.com/Shopify/shopify-cli/issues (and feel free to add any additional information in a comment!)
+2. You've given as much detail as reasonably possible
+3. You're working with the latest CLI version (check the badge at https://github.com/Shopify/shopify-cli)
+
+This is important because:
+
+1. We will notice and prioritize 1 popular issue more quickly than many small duplicates
+2. More details = faster, higher-quality response
+3. We might have fixed your issue already!
+
+-->
+
 # Issue summary
 
 Write a short description of the issue here ↓

data/CHANGELOG.md

@@ -2,6 +2,40 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.10.2
+### Fixed
+* [#1983](https://github.com/Shopify/shopify-cli/pull/1983): Improve Windows compatibility
+* [#1928](https://github.com/Shopify/shopify-cli/pull/1928): Ensure script Wasm file sizes don't exceed the limit
+
+## Version 2.10.1
+### Fixed
+* [#1985](https://github.com/Shopify/shopify-cli/pull/1985): Revert "Fix CORS (Cross-origin resource sharing) errors (#1952)"
+
+## Version 2.10.0
+### Fixed
+* [#1937](https://github.com/Shopify/shopify-cli/pull/1937): Fix `theme pull` to no longer add empty lines on Windows
+* [#1952](https://github.com/Shopify/shopify-cli/pull/1952): Fix CORS (cross-origin resource sharing) errors
+* [#1965](https://github.com/Shopify/shopify-cli/pull/1965): Revert: Fix partners ability to login to external shops. (#1873)
+
+### Added
+* [#1892](https://github.com/Shopify/shopify-cli/pull/1892): Add `-o`/`--only` parameter to filter files on `theme push`/`theme pull` commands
+
+## Version 2.9.0
+### Fixed
+* [#1922](https://github.com/Shopify/shopify-cli/pull/1922): Respect RUBY_BINDIR from Homebrew for installing gem
+* [#1906](https://github.com/Shopify/shopify-cli/pull/1906): Fix Ngrok incompatibility with some Apple ARM environments
+* [#1873](https://github.com/Shopify/shopify-cli/pull/1873): Fix partners ability to login to external shops.
+* [#1909](https://github.com/Shopify/shopify-cli/pull/1909): Fix `theme serve` on Safari
+
+### Added
+* [#1900](https://github.com/Shopify/shopify-cli/pull/1900): Add `-d`/`--development` flag to Shopify theme pull command
+* [#1891](https://github.com/Shopify/shopify-cli/pull/1891): Allow for additional arguments in `shopify push script` on CI.
+* [#1877](https://github.com/Shopify/shopify-cli/pull/1877): Add theme (`-t`/`--theme=NAME_OR_ID`) parameter to `theme push`/`theme pull` commands
+* [#1871](https://github.com/Shopify/shopify-cli/pull/1871): Add a new `--live-reload` parameter to the `theme serve` command
+
+### Changed
+- [#1929](https://github.com/Shopify/shopify-cli/pull/1929): Rename `--registration-id` to `--extension-id` in `shopify extension push`.
+
 ## Version 2.8.0
 ### Fixed
 * [#1879](https://github.com/Shopify/shopify-cli/pull/1879): Disambiguate -s as store option

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.8.0)
+    shopify-cli (2.10.2)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.9.0)

data/RELEASING.md

@@ -23,21 +23,22 @@
    ```
 
 9. Open a PR for the branch, get necessary approvals from code owners and merge into main branch. Note that the PR title will be the release note in Shipit, so make sure it mentions the release
-10. Deploy using Shipit
+10. Deploy to RubyGems using [Shipit](https://shipit.shopify.io/shopify/shopify-cli/rubygems)
 11. Update your `main` branch to the latest version
    ```
    $ git checkout main
    $ git pull
    ```
    
-12. On local machine and _AFTER_ gem has been published to https://rubygems.org, run
+12. On local machine and _AFTER_ gem has been published to https://rubygems.org/gems/shopify-cli, run
    ```
    $ rake package
    ```
    This will generate the `.deb`, `.rpm` and brew formula files, which will be located in `packaging/builds/X.Y.Z/`.
 
 13. Clone the `Shopify/homebrew-shopify` repository (if not already cloned), and then
-    * create a branch named `release_X_Y_Z_of_shopify-cli`
+    * update your `master` branch to the latest version: `git checkout master && git pull`
+    * create a new branch: `git checkout -b release_X_Y_Z_of_shopify-cli`
     * update the brew formula in `shopify-cli.rb` with the generated formula in `packaging/builds/X.Y.Z/` in the `Shopify/shopify-cli` repo (from the `rake package` step above)
     * commit the change and create a PR on the [Shopify Homebrew repository](https://github.com/Shopify/homebrew-shopify)
     * when PR is approved, merge into main branch

data/ext/javy/javy.rb

@@ -5,7 +5,7 @@ require "digest/sha2"
 
 module Javy
   ROOT = __dir__
-  BIN_FOLDER = File.join(ROOT, "bin")
+  BIN_FOLDER = File.join(ShopifyCLI.cache_dir, "javy", "bin")
   HASH_FOLDER = File.join(ROOT, "hashes")
   VERSION = File.read(File.join(ROOT, "version")).strip
   TARGET = File.join(BIN_FOLDER, "javy-#{VERSION}")

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

@@ -9,7 +9,7 @@ module Extension
       options do |parser, flags|
         parser.on("--api-key=API_KEY") { |api_key| flags[:api_key] = api_key.gsub('"', "") }
         parser.on("--api-secret=API_SECRET") { |api_secret| flags[:api_secret] = api_secret.gsub('"', "") }
-        parser.on("--registration-id=REGISTRATION_ID") do |registration_id|
+        parser.on("--extension-id=EXTENSION_ID") do |registration_id|
           flags[:registration_id] = registration_id.gsub('"', "")
         end
       end
@@ -35,7 +35,7 @@ module Extension
       end
 
       def register_if_necessary(project:, args:, name:)
-        if @ctx.tty? && !project.registered?
+        if ShopifyCLI::Environment.interactive? && !project.registered?
           Command::Register.new(@ctx).call(args, name)
         end
       end

data/lib/project_types/extension/messages/messages.rb

@@ -91,7 +91,7 @@ module Extension
             Usage: {{command:%s extension push}}
             Options:
               {{command:--api-key=API_KEY}} Connect your extension and app by inserting your app's API key (which you can get from your app setup page on shopify.dev).
-              {{command:--registration-id=REGISTRATION_ID}} The id of the extension's registration.
+              {{command:--extension-id=EXTENSION_ID}} The id of the extension's registration.
         HELP
         frame_title: "Pushing your extension to Shopify",
         waiting_text: "Pushing code to Shopify…",

data/lib/project_types/extension/models/development_server.rb

@@ -40,7 +40,7 @@ module Extension
 
       def serve(context, server_config)
         CLI::Kit::System.popen3(executable, "serve", "-") do |input, out, err, status|
-          context.puts("Sending configuration data …")
+          context.debug("Sending configuration data to extension development server …")
           input << server_config.to_yaml
           input.close
 
@@ -57,17 +57,15 @@ module Extension
       private
 
       def forward_output_to_user(out, err, ctx)
-        ctx.puts("Starting monitoring threads …")
+        ctx.debug("Starting message processing threads to relay output produced by the extension development server …")
 
         Thread.new do
-          ctx.puts("Ready to process standard output")
           while (line = out.gets)
             ctx.puts(line)
           end
         end
 
         Thread.new do
-          ctx.puts("Ready to process standard error")
           while (error = err.gets)
             ctx.puts(error)
           end

data/lib/project_types/rails/gem.rb

@@ -79,8 +79,7 @@ module Rails
     def install!
       spin = CLI::UI::SpinGroup.new
       spin.add(ctx.message("rails.gem.installing", name)) do |spinner|
-        args = %w(gem install)
-        args.push(name)
+        args = ["#{ENV["RUBY_BINDIR"]}gem", "install", name]
         unless version.nil?
           if ctx.windows? && version.include?("~")
             args.push("-v", "\"#{version}\"")

data/lib/project_types/script/cli.rb

@@ -57,6 +57,7 @@ module Script
       autoload :CommandRunner, Project.project_filepath("layers/infrastructure/command_runner")
       autoload :PushPackageRepository, Project.project_filepath("layers/infrastructure/push_package_repository")
       autoload :ExtensionPointRepository, Project.project_filepath("layers/infrastructure/extension_point_repository")
+      autoload :MetadataRepository, Project.project_filepath("layers/infrastructure/metadata_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")
@@ -73,6 +74,10 @@ module Script
           Project.project_filepath("layers/infrastructure/languages/typescript_project_creator.rb")
         autoload :TypeScriptTaskRunner,
           Project.project_filepath("layers/infrastructure/languages/typescript_task_runner.rb")
+        autoload :WasmProjectCreator,
+          Project.project_filepath("layers/infrastructure/languages/wasm_project_creator.rb")
+        autoload :WasmTaskRunner,
+          Project.project_filepath("layers/infrastructure/languages/wasm_task_runner.rb")
       end
 
       module ApiClients
@@ -92,5 +97,10 @@ module Script
 
   autoload :Errors, Project.project_filepath("errors")
 
+  module Loaders
+    autoload :Project, Script::Project.project_filepath("loaders/project")
+    autoload :SpecificationHandler, Script::Project.project_filepath("loaders/specification_handler")
+  end
+
   class ScriptProjectError < StandardError; end
 end

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

@@ -6,7 +6,7 @@ module Script
       prerequisite_task ensure_project_type: :script
 
       def call(_args, _)
-        Layers::Application::ConnectApp.call(ctx: @ctx, force: true, strict: true)
+        Layers::Application::ConnectApp.call(ctx: @ctx, force: true)
       rescue StandardError => e
         UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message("script.connect.error.operation_failed"))
       end

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

@@ -33,8 +33,14 @@ module Script
       end
 
       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(", "))
+        allowed_apis = Layers::Application::ExtensionPoints.available_types.map { |type| "{{cyan:#{type}}}" }
+        allowed_languages = Layers::Application::ExtensionPoints.all_languages.map { |lang| "{{cyan:#{lang}}}" }
+        ShopifyCLI::Context.message(
+          "script.create.help",
+          ShopifyCLI::TOOL_NAME,
+          allowed_apis.join(", "),
+          allowed_languages.join(", ")
+        )
       end
     end
   end

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

@@ -7,25 +7,48 @@ module Script
 
       options do |parser, flags|
         parser.on("--force") { |t| flags[:force] = t }
+        parser.on("--api-key=API_KEY") { |api_key| flags[:api_key] = api_key.gsub('"', "") }
+        parser.on("--api-secret=API_SECRET") { |api_secret| flags[:api_secret] = api_secret.gsub('"', "") }
+        parser.on("--uuid=UUID") do |uuid|
+          flags[:uuid] = uuid.gsub('""', "")
+        end
       end
 
       def call(_args, _name)
-        fresh_env = Layers::Application::ConnectApp.call(ctx: @ctx)
-
-        force = options.flags.key?(:force) || !!fresh_env
+        connect_to_app
+        project = load_project
+        push(project: project)
+      rescue StandardError => e
+        UI::ErrorHandler.pretty_print_and_raise(e,
+          failed_op: @ctx.message("script.push.error.operation_failed_no_api_key"))
+      end
 
-        api_key = Layers::Infrastructure::ScriptProjectRepository.new(ctx: @ctx).get.api_key
-        return @ctx.puts(self.class.help) unless api_key
+      def push(project:)
+        force = options.flags.key?(:force)
+        api_key = project.env[:api_key]
+        uuid = project.env[:extra]["UUID"]
 
-        Layers::Application::PushScript.call(ctx: @ctx, force: force)
-        @ctx.puts(@ctx.message("script.push.script_pushed", api_key: api_key))
-      rescue StandardError => e
-        msg = if api_key
-          @ctx.message("script.push.error.operation_failed_with_api_key", api_key: api_key)
+        if ShopifyCLI::Environment.interactive? || (uuid && !uuid.empty?)
+          Layers::Application::PushScript.call(ctx: @ctx, force: force, project: project)
+          @ctx.puts(@ctx.message("script.push.script_pushed", api_key: api_key))
         else
-          @ctx.message("script.push.error.operation_failed_no_api_key")
+          raise ShopifyCLI::Abort, @ctx.message("script.push.error.operation_failed_no_uuid")
+        end
+      end
+
+      def load_project
+        Script::Loaders::Project.load(
+          directory: Dir.pwd,
+          api_key: options.flags[:api_key],
+          api_secret: options.flags[:api_secret],
+          uuid: options.flags[:uuid]
+        )
+      end
+
+      def connect_to_app
+        if ShopifyCLI::Environment.interactive?
+          Layers::Application::ConnectApp.call(ctx: @ctx)
         end
-        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: msg)
       end
 
       def self.help

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

@@ -8,6 +8,9 @@ payment_methods:
       beta: true
       package: "@shopify/scripts-checkout-apis"
       repo: "https://github.com/Shopify/scripts-apis-examples"
+    wasm:
+      beta: true
+      repo: "https://github.com/Shopify/scripts-apis-examples"
 shipping_methods:
   domain: 'checkout'
   libraries:
@@ -18,6 +21,9 @@ shipping_methods:
       beta: true
       package: "@shopify/scripts-checkout-apis"
       repo: "https://github.com/Shopify/scripts-apis-examples"
+    wasm:
+      beta: true
+      repo: "https://github.com/Shopify/scripts-apis-examples"
 merchandise_discount_types:
   beta: true
   domain: 'discounts'
@@ -26,6 +32,9 @@ merchandise_discount_types:
       beta: true
       package: "@shopify/scripts-discounts-apis"
       repo: "https://github.com/Shopify/scripts-apis-examples"
+    wasm:
+      beta: true
+      repo: "https://github.com/Shopify/scripts-apis-examples"
 delivery_discount_types:
   beta: true
   domain: 'discounts'
@@ -34,3 +43,6 @@ delivery_discount_types:
       beta: true
       package: "@shopify/scripts-discounts-apis"
       repo: "https://github.com/Shopify/scripts-apis-examples"
+    wasm:
+      beta: true
+      repo: "https://github.com/Shopify/scripts-apis-examples"

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

@@ -11,6 +11,7 @@ mutation AppScriptSet(
   $configurationDefinition: String!,
   $moduleUploadUrl: String!,
   $library: LibraryInput,
+  $inputQuery: String,
 ) {
   appScriptSet(
     uuid: $uuid
@@ -25,6 +26,7 @@ mutation AppScriptSet(
     configurationDefinition: $configurationDefinition,
     moduleUploadUrl: $moduleUploadUrl,
     library: $library,
+    inputQuery: $inputQuery,
 ) {
     userErrors {
       field

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

@@ -1,6 +1,10 @@
 mutation moduleUploadUrlGenerate {
   moduleUploadUrlGenerate {
-    url
+    details {
+      url
+      headers
+      humanizedMaxSize
+    }
     userErrors {
       field
       message

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

@@ -9,11 +9,14 @@ module Script
             CLI::UI::Frame.open(ctx.message("script.application.building")) do
               begin
                 UI::StrictSpinner.spin(ctx.message("script.application.building_script")) do |spinner|
+                  script_content = task_runner.build
+                  metadata_file_location = task_runner.metadata_file_location
+                  metadata = Infrastructure::MetadataRepository.new(ctx: ctx).get_metadata(metadata_file_location)
+
                   Infrastructure::PushPackageRepository.new(ctx: ctx).create_push_package(
                     script_project: script_project,
-                    script_content: task_runner.build,
-                    compiled_type: task_runner.compiled_type,
-                    metadata: task_runner.metadata,
+                    script_content: script_content,
+                    metadata: metadata,
                     library: library,
                   )
                   spinner.update_title(ctx.message("script.application.built"))

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

@@ -7,7 +7,7 @@ module Script
     module Application
       class ConnectApp
         class << self
-          def call(ctx:, force: false, strict: false)
+          def call(ctx:, force: false)
             script_project_repo = Layers::Infrastructure::ScriptProjectRepository.new(ctx: ctx)
             script_project = script_project_repo.get
 
@@ -40,10 +40,6 @@ module Script
 
             uuid = Forms::AskScriptUuid.ask(ctx, scripts, nil)&.uuid
 
-            if strict && uuid.nil?
-              ctx.abort(ctx.message("script.connect.missing_script"))
-            end
-
             script_project_repo.create_env(
               api_key: app["apiKey"],
               secret: app["apiSecretKeys"].first["secret"],
@@ -52,6 +48,16 @@ module Script
             ctx.done(ctx.message("script.connect.connected", app["title"]))
 
             true
+          rescue SmartProperties::InitializationError, SmartProperties::InvalidValueError => error
+            handle_error(error, context: ctx)
+          end
+
+          def handle_error(error, context:)
+            properties_hash = { api_key: "SHOPIFY_API_KEY", secret: "SHOPIFY_API_SECRET" }
+            missing_env_variables = error.properties.map { |p| properties_hash[p.name] }.compact.join(", ")
+            raise ShopifyCLI::Abort,
+              context.message("script.connect.error.missing_env_file_variables", missing_env_variables,
+                ShopifyCLI::TOOL_NAME)
           end
 
           private

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

@@ -4,37 +4,61 @@ module Script
   module Layers
     module Application
       class ExtensionPoints
-        def self.get(type:)
-          Infrastructure::ExtensionPointRepository.new.get_extension_point(type)
-        end
+        class << self
+          def get(type:)
+            extension_point_repository.get_extension_point(type)
+          end
 
-        def self.types
-          Infrastructure::ExtensionPointRepository.new.extension_point_types
-        end
+          def types
+            extension_point_repository.extension_point_types
+          end
 
-        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)
-          end.map(&:type)
-        end
+          def available_types
+            available_extension_points.map(&:type)
+          end
 
-        def self.deprecated_types
-          Infrastructure::ExtensionPointRepository.new
-            .extension_points
-            .select(&:deprecated?)
-            .map(&:type)
-        end
+          def deprecated_types
+            extension_point_repository
+              .extension_points
+              .select(&:deprecated?)
+              .map(&:type)
+          end
 
-        def self.languages(type:)
-          get(type: type).libraries.all.map do |library|
-            next nil if library.beta? && !ShopifyCLI::Feature.enabled?(:scripts_beta_languages)
-            library.language
-          end.compact
-        end
+          def all_languages
+            available_extension_points
+              .map { |ep| ep.library_languages(include_betas: include_beta_languages?) }
+              .flatten
+              .uniq
+          end
+
+          def languages(type:)
+            get(type: type).library_languages(include_betas: include_beta_languages?)
+          end
+
+          def supported_language?(type:, language:)
+            languages(type: type).include?(language.downcase)
+          end
+
+          private
+
+          def available_extension_points
+            extension_point_repository.extension_points.select do |ep|
+              next false if ep.deprecated?
+              ep.stable? || include_beta_extension_points?
+            end
+          end
+
+          def extension_point_repository
+            Infrastructure::ExtensionPointRepository.new
+          end
+
+          def include_beta_languages?
+            ShopifyCLI::Feature.enabled?(:scripts_beta_languages)
+          end
 
-        def self.supported_language?(type:, language:)
-          languages(type: type).include?(language.downcase)
+          def include_beta_extension_points?
+            ShopifyCLI::Feature.enabled?(:scripts_beta_extension_points)
+          end
         end
       end
     end

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

@@ -3,7 +3,7 @@ module Script
     module Application
       class ProjectDependencies
         def self.install(ctx:, task_runner:)
-          CLI::UI::Frame.open(ctx.message("script.project_deps.checking_with_npm")) do
+          CLI::UI::Frame.open(ctx.message("script.project_deps.checking")) do
             begin
               if task_runner.dependencies_installed?
                 ctx.puts(ctx.message("script.project_deps.none_required"))

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

@@ -5,50 +5,61 @@ module Script
     module Application
       class PushScript
         class << self
-          def call(ctx:, force:)
+          def call(ctx:, force:, project:)
             script_project_repo = Infrastructure::ScriptProjectRepository.new(ctx: ctx)
             script_project = script_project_repo.get
+            script_project.env = project.env
             task_runner = Infrastructure::Languages::TaskRunner
               .for(ctx, script_project.language, script_project.script_name)
 
             extension_point = ExtensionPoints.get(type: script_project.extension_point_type)
-            library_name = extension_point.libraries.for(script_project.language)&.package
+
+            library = extension_point.libraries.for(script_project.language)
+
             raise Infrastructure::Errors::LanguageLibraryForAPINotFoundError.new(
               language: script_project.language,
               api: script_project.extension_point_type
-            ) unless library_name
+            ) if library.nil? && (script_project.language != "wasm")
 
-            library = {
+            library_name = library&.package
+            library_data = {
               language: script_project.language,
               version: task_runner.library_version(library_name),
-            }
+            } if library_name
 
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
-            BuildScript.call(ctx: ctx, task_runner: task_runner, script_project: script_project, library: library)
-
-            UI::PrintingSpinner.spin(ctx, ctx.message("script.application.pushing")) do |p_ctx, spinner|
-              package = Infrastructure::PushPackageRepository.new(ctx: p_ctx).get_push_package(
-                script_project: script_project,
-                compiled_type: task_runner.compiled_type,
-                metadata: task_runner.metadata,
-                library: library,
-              )
-              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_config: package.script_config,
-                module_upload_url: module_upload_url,
-                library: package.library,
-              )
-              script_project_repo.update_env(uuid: uuid)
-              spinner.update_title(p_ctx.message("script.application.pushed"))
+            BuildScript.call(ctx: ctx, task_runner: task_runner, script_project: script_project, library: library_data)
+
+            metadata_file_location = task_runner.metadata_file_location
+            metadata = Infrastructure::MetadataRepository.new(ctx: ctx).get_metadata(metadata_file_location)
+
+            CLI::UI::Frame.open(ctx.message("script.application.pushing")) do
+              UI::PrintingSpinner.spin(ctx, ctx.message("script.application.pushing_script")) do |p_ctx, spinner|
+                package = Infrastructure::PushPackageRepository.new(ctx: p_ctx).get_push_package(
+                  script_project: script_project,
+                  metadata: metadata,
+                  library: library_data,
+                )
+                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_config: package.script_config,
+                  module_upload_url: module_upload_url,
+                  library: package.library,
+                  input_query: script_project.input_query,
+                )
+                if ShopifyCLI::Environment.interactive?
+                  script_project_repo.update_env(uuid: uuid)
+                end
+                spinner.update_title(p_ctx.message("script.application.pushed"))
+              end
             end
           end
         end