@shopify/cli-kit 3.69.4 → 3.70.0

package/assets/cli-ruby/lib/shopify_cli/theme/extension/app_extension.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-require "forwardable"
-require "shopify_cli/theme/root"
-
-module ShopifyCLI
-  module Theme
-    module Extension
-      class AppExtension
-        extend Forwardable
-
-        attr_reader :app_id, :location, :registration_id
-        def_delegators :@root_obj,
-          :root,
-          :static_asset_files,
-          :liquid_files,
-          :json_files,
-          :glob,
-          :static_asset_file?,
-          :static_asset_paths,
-          :[],
-          :file?
-
-        def initialize(ctx, root:, app_id: nil, location: nil, registration_id: nil)
-          @app_id = app_id
-          @location = location
-          @registration_id = registration_id
-          @root_obj = Root.new(ctx, root: root)
-        end
-
-        def extension_files
-          (glob(["**/*.liquid", "**/*.json"]) + static_asset_files).uniq
-        end
-
-        def extension_file?(file)
-          extension_files.include?(self[file])
-        end
-      end
-    end
-  end
-end

package/assets/cli-ruby/lib/shopify_cli/theme/extension/dev_server/hooks/file_change_hook.rb

@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-require "shopify_cli/theme/extension/ignore_helper"
-
-module ShopifyCLI
-  module Theme
-    module Extension
-      class DevServer
-        module Hooks
-          class FileChangeHook
-            include ShopifyCLI::Theme::Extension::IgnoreHelper
-
-            attr_reader :ctx, :extension, :syncer, :streams, :ignore_filter
-
-            def initialize(ctx, extension:, syncer:, ignore_filter: nil)
-              @ctx = ctx
-              @extension = extension
-              @syncer = syncer
-              @ignore_filter = ignore_filter
-            end
-
-            def call(modified, added, removed, streams: nil)
-              @streams = streams
-
-              modified = paths(modified)
-                .select { |file| @extension.extension_file?(file) }
-                .reject { |file| ignore_path?(file) }
-              added = paths(added)
-                .select { |file| @extension.extension_file?(file) }
-                .reject { |file| ignore_path?(file) }
-              removed = paths(removed)
-
-              hot_reload(modified) unless modified.empty?
-              reload_page(added, removed) unless (added + removed).empty?
-            end
-
-            private
-
-            def hot_reload(modified)
-              broadcast(modified: modified)
-
-              ctx.debug("[HotReload] Modified: #{modified.join(", ")}")
-            end
-
-            def reload_page(added, removed)
-              wait_blocking_operations
-
-              broadcast(reload_page: true)
-
-              ctx.debug("[ReloadPage] Added: #{added.join(", ")}")
-              ctx.debug("[ReloadPage] Removed: #{removed.join(", ")}")
-            end
-
-            def wait_blocking_operations
-              retries = 10
-              while syncer.any_blocking_operation? && !retries.zero?
-                sleep(0.5)
-                retries -= 1
-              end
-            end
-
-            def paths(files)
-              files
-                .map { |file| extension[file] }
-                .reject(&:liquid_css?)
-                .map(&:relative_path)
-            end
-
-            def broadcast(message)
-              streams&.broadcast(JSON.generate(message))
-            end
-          end
-        end
-      end
-    end
-  end
-end

package/assets/cli-ruby/lib/shopify_cli/theme/extension/dev_server/hot_reload/script_injector.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require "shopify_cli/theme/dev_server/hot_reload/script_injector"
-
-module ShopifyCLI
-  module Theme
-    module Extension
-      class DevServer < ShopifyCLI::Theme::DevServer
-        class HotReload < ShopifyCLI::Theme::DevServer::HotReload
-          class ScriptInjector < ShopifyCLI::Theme::DevServer::HotReload::ScriptInjector
-            private
-
-            def javascript_files
-              %w(hot_reload.js sse_client.js theme_extension.js)
-            end
-
-            def javascript_inline
-              env = { mode: @mode }
-              <<~JS
-                (() => {
-                  window.__SHOPIFY_CLI_ENV__ = #{env.to_json};
-                })();
-              JS
-            end
-          end
-        end
-      end
-    end
-  end
-end

package/assets/cli-ruby/lib/shopify_cli/theme/extension/dev_server/hot_reload.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require "shopify_cli/theme/dev_server/hot_reload"
-
-module ShopifyCLI
-  module Theme
-    module Extension
-      class DevServer < ShopifyCLI::Theme::DevServer
-        class HotReload < ShopifyCLI::Theme::DevServer::HotReload; end
-      end
-    end
-  end
-end

package/assets/cli-ruby/lib/shopify_cli/theme/extension/dev_server/local_assets.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require "shopify_cli/theme/dev_server/local_assets"
-
-module ShopifyCLI
-  module Theme
-    module Extension
-      class DevServer < ShopifyCLI::Theme::DevServer
-        class LocalAssets < ShopifyCLI::Theme::DevServer::LocalAssets
-          SUPPORTED_EXTENSIONS = [:js, :css].join("|")
-          TAE_ASSET_REGEX = %r{(http:|https:)?//cdn\..*?(shopify\.com|spin\.dev)(/[^/]+)*?/extensions/.+?/(assets/.+?\.(?:#{SUPPORTED_EXTENSIONS}))}
-
-          private
-
-          def replace_asset_urls(body)
-            replaced_body = body.join.gsub(TAE_ASSET_REGEX) do |match|
-              path = Regexp.last_match[4]
-              if @target.static_asset_paths.include?(path)
-                "/#{path}"
-              else
-                match
-              end
-            end
-
-            [replaced_body]
-          end
-        end
-      end
-    end
-  end
-end

package/assets/cli-ruby/lib/shopify_cli/theme/extension/dev_server/proxy_param_builder.rb

@@ -1,94 +0,0 @@
-# frozen_string_literal: true
-
-require "cgi"
-require "shopify_cli/theme/dev_server"
-
-module ShopifyCLI
-  module Theme
-    module Extension
-      class DevServer < ShopifyCLI::Theme::DevServer
-        class ProxyParamBuilder
-          def build
-            # Core doesn't support replace_extension_templates
-            return {} if core?(current_path)
-
-            (request_templates + syncer_templates)
-              .select(&:liquid?)
-              .uniq(&:relative_path)
-              .reject { |file| proxy_cannot_render?(file) }
-              .map { |file| as_param(file) }
-              .to_h
-          end
-
-          def with_core_endpoints(core_endpoints)
-            @core_endpoints = core_endpoints
-            self
-          end
-
-          def with_syncer(syncer)
-            @syncer = syncer
-            self
-          end
-
-          def with_rack_env(rack_env)
-            @rack_env = rack_env
-            self
-          end
-
-          def with_extension(extension)
-            @extension = extension
-            self
-          end
-
-          private
-
-          def proxy_cannot_render?(file)
-            !(file&.relative_path&.include?("blocks/") || file&.relative_path&.include?("snippets/"))
-          end
-
-          def as_param(file)
-            if file&.relative_path&.include?("blocks/")
-              ["replace_extension_templates[blocks][#{file.relative_path}]", file.read]
-            elsif file&.relative_path&.include?("snippets/")
-              ["replace_extension_templates[snippets][#{file.relative_path}]", file.read]
-            end
-          end
-
-          def request_templates
-            cookie_files
-              .map { |file_path| @extension[file_path] unless @extension.nil? }
-              .compact
-          end
-
-          def syncer_templates
-            @syncer&.pending_files || []
-          end
-
-          def cookie_files
-            CGI::Cookie.parse(cookie)["hot_reload_files"].join.split(",") || []
-          end
-
-          def core?(path)
-            core_endpoints.include?(path)
-          end
-
-          def current_path
-            rack_env["PATH_INFO"]
-          end
-
-          def cookie
-            rack_env["HTTP_COOKIE"]
-          end
-
-          def core_endpoints
-            @core_endpoints || []
-          end
-
-          def rack_env
-            @rack_env || {}
-          end
-        end
-      end
-    end
-  end
-end

package/assets/cli-ruby/lib/shopify_cli/theme/extension/dev_server/watcher.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-require "shopify_cli/file_system_listener"
-require "shopify_cli/theme/dev_server"
-require "forwardable"
-
-module ShopifyCLI
-  module Theme
-    module Extension
-      class DevServer < ShopifyCLI::Theme::DevServer
-        # Watches for file changes and publish events to the theme
-        class Watcher
-          extend Forwardable
-
-          def_delegators :@listener, :add_observer, :changed, :notify_observers
-
-          def initialize(ctx, extension:, syncer:, poll: false, ignore_filter: nil)
-            @ctx = ctx
-            @extension = extension
-            @syncer = syncer
-            @ignore_filter = ignore_filter
-            @listener = FileSystemListener.new(root: @extension.root.to_s, force_poll: poll,
-              ignore_regex: @ignore_filter&.regexes)
-
-            add_observer(self, :notify_updates)
-          end
-
-          def start
-            @listener.start
-          end
-
-          def stop
-            @listener.stop
-          end
-
-          def notify_updates(modified, added, removed)
-            @syncer.enqueue_updates(files(modified).select { |file| @extension.extension_file?(file) })
-            @syncer.enqueue_creates(files(added).select { |file| @extension.extension_file?(file) })
-            @syncer.enqueue_deletes(files(removed))
-          end
-
-          def files(paths)
-            paths.map { |file| @extension[file] }
-          end
-        end
-      end
-    end
-  end
-end

package/assets/cli-ruby/lib/shopify_cli/theme/extension/dev_server.rb

@@ -1,175 +0,0 @@
-# frozen_string_literal: true
-
-require "pathname"
-
-require "shopify_cli/theme/extension/app_extension"
-require "shopify_cli/theme/dev_server"
-require "shopify_cli/theme/extension/host_theme"
-require "shopify_cli/theme/syncer"
-require "shopify_cli/theme/ignore_filter"
-
-require_relative "dev_server/local_assets"
-require_relative "dev_server/proxy_param_builder"
-require_relative "dev_server/watcher"
-require_relative "dev_server/hooks/file_change_hook"
-require_relative "dev_server/hot_reload"
-require_relative "dev_server/hot_reload/script_injector"
-require_relative "syncer"
-
-module ShopifyCLI
-  module Theme
-    module Extension
-      class DevServer < ShopifyCLI::Theme::DevServer
-        # Themes
-        Proxy = ShopifyCLI::Theme::DevServer::Proxy
-        CdnFonts = ShopifyCLI::Theme::DevServer::CdnFonts
-
-        # Extensions
-        ScriptInjector = ShopifyCLI::Theme::Extension::DevServer::HotReload::ScriptInjector
-
-        attr_accessor :project, :specification_handler, :generate_tmp_theme
-        attr_reader :notify
-
-        class << self
-          def start(ctx, root, port: 9292, theme: nil, generate_tmp_theme: false, project:, specification_handler:,
-            notify:)
-            instance.project = project
-            instance.specification_handler = specification_handler
-            instance.generate_tmp_theme = generate_tmp_theme
-
-            super(ctx, root, port: port, theme: theme, notify: notify)
-          end
-        end
-
-        private
-
-        def middleware_stack
-          @app = Proxy.new(ctx, theme, param_builder)
-          @app = CdnFonts.new(ctx, @app, theme: theme)
-          @app = LocalAssets.new(ctx, @app, extension)
-          @app = HotReload.new(ctx, @app, broadcast_hooks: broadcast_hooks, watcher: watcher, mode: mode,
-            script_injector: script_injector)
-        end
-
-        def sync_theme
-          # Ensures the host theme exists
-          theme
-
-          # Ensure the theme app extension is pushed
-          extension
-        end
-
-        def syncer
-          @syncer ||= Syncer.new(
-            ctx,
-            extension: extension,
-            project: project,
-            specification_handler: specification_handler,
-            ignore_filter: ignore_filter,
-            notify: notify
-          )
-        end
-
-        def theme
-          @theme ||= if theme_identifier
-            theme = HostTheme.find_by_identifier(ctx, identifier: theme_identifier)
-            ctx.abort(not_found_error_message) unless theme
-            theme.generate_tmp_theme if generate_tmp_theme
-            theme
-          else
-            HostTheme.find_or_create!(ctx)
-          end
-        end
-
-        def extension
-          return @extension if @extension
-
-          app = fetch_theme_app_extension_info.dig(*%w(data app)) || {}
-
-          app_id = app["id"]
-
-          registrations = app["extensionRegistrations"] || []
-          registration = registrations.find { |r| r["type"] == "THEME_APP_EXTENSION" } || {}
-
-          location = registration.dig(*%w(draftVersion location))
-          registration_id = registration["id"]
-
-          @extension = AppExtension.new(
-            ctx,
-            root: root,
-            app_id: app_id,
-            location: location,
-            registration_id: registration_id,
-          )
-        end
-
-        def fetch_theme_app_extension_info
-          params = {
-            api_key: project.app.api_key,
-            type: specification_handler.identifier.downcase,
-          }
-
-          PartnersAPI.query(@ctx, "get_extension_registrations", **params)
-        end
-
-        def watcher
-          @watcher ||= Watcher.new(ctx, syncer: syncer, extension: extension, poll: poll, ignore_filter: ignore_filter)
-        end
-
-        def param_builder
-          @param_builder ||= ProxyParamBuilder
-            .new
-            .with_extension(extension)
-            .with_syncer(syncer)
-        end
-
-        def ignore_filter
-          @ignore_filter ||= ShopifyCLI::Theme::IgnoreFilter.from_path(root)
-        end
-
-        def setup_server
-          ctx.puts("\n--------- #{frame_title}")
-          ctx.puts(preview_message)
-          ctx.puts("------------------\n")
-
-          watcher.start
-          syncer.start
-        end
-
-        # Hooks
-
-        def broadcast_hooks
-          file_handler = Hooks::FileChangeHook.new(ctx, extension: extension, syncer: syncer,
-            ignore_filter: ignore_filter)
-          [file_handler]
-        end
-
-        def script_injector
-          ScriptInjector.new(ctx)
-        end
-
-        # Messages
-
-        def frame_title
-          ctx.message("serve.frame_title", root)
-        end
-
-        def preview_message
-          if Shopifolk.acting_as_shopify_organization?
-            parsed_uri = URI.parse(extension.location)
-            shopify_org_url = "#{parsed_uri.scheme}://#{parsed_uri.host}/9082/impersonate"
-            if ShopifyCLI::Environment.unified_deployment?
-              ctx.message("serve.preview_message_1p_unified", shopify_org_url, theme.editor_url, address)
-            else
-              ctx.message("serve.preview_message_1p", shopify_org_url, extension.location, theme.editor_url, address)
-            end
-          elsif ShopifyCLI::Environment.unified_deployment?
-            ctx.message("serve.preview_message_unified", theme.editor_url, address)
-          else
-            ctx.message("serve.preview_message", extension.location, theme.editor_url, address)
-          end
-        end
-      end
-    end
-  end
-end

package/assets/cli-ruby/lib/shopify_cli/theme/extension/host_theme.rb

@@ -1,109 +0,0 @@
-# frozen_string_literal: true
-
-require "fileutils"
-require_relative "../syncer"
-require_relative "../development_theme"
-require "shopify_cli/git"
-require "shopify_cli/theme/extension/ui/host_theme_raw_progress_bar"
-require "tmpdir"
-
-require "shopify_cli/git"
-require "shopify_cli/theme/development_theme"
-require "shopify_cli/theme/syncer"
-
-module ShopifyCLI
-  module Theme
-    module Extension
-      class HostTheme < DevelopmentTheme
-        def id
-          ShopifyCLI::DB.get(:host_theme_id)
-        end
-
-        def name
-          existing_name = ShopifyCLI::DB.get(:host_theme_name)
-          if existing_name.nil? || existing_name.length > API_NAME_LIMIT
-            generate_host_theme_name
-          else
-            existing_name
-          end
-        end
-
-        def ensure_exists!
-          if exists?
-            @ctx.debug("Using temporary host theme: ##{id} #{name}")
-          else
-            create
-            @ctx.debug("Created temporary host theme: #{@id}")
-          end
-
-          self
-        end
-
-        def self.delete(ctx)
-          new(ctx, root: nil).delete
-        end
-
-        def delete
-          delete_theme if exists? # Avoid deleting any existing development theme logic
-
-          ShopifyCLI::DB.del(:host_theme_id) if ShopifyCLI::DB.exists?(:host_theme_id)
-          ShopifyCLI::DB.del(:host_theme_name) if ShopifyCLI::DB.exists?(:host_theme_name)
-        end
-
-        def create
-          super
-          ShopifyCLI::DB.set(host_theme_id: @id)
-
-          generate_tmp_theme
-        end
-
-        def self.find_or_create!(ctx)
-          new(ctx, root: nil).ensure_exists!
-        end
-
-        def self.find_by_identifier(ctx, root: nil, identifier:)
-          ShopifyCLI::DB.set(host_theme_id: identifier)
-          find(ctx, root: root)
-        end
-
-        def generate_tmp_theme
-          ctx = @ctx.dup
-
-          Dir.mktmpdir do |dir|
-            @root = Pathname.new(dir)
-            ctx.root = dir
-
-            syncer = ShopifyCLI::Theme::Syncer.new(ctx, theme: self)
-
-            begin
-              syncer.start_threads
-              ctx.puts("\n--------- #{ctx.message("theme.push.info.pushing", name, id, shop)}")
-              UI::HostThemeRawProgressBar.new(syncer, dir).progress(:upload_theme!, delete: false)
-              ctx.puts("------------------\n")
-            rescue Errno::ENOENT => e
-              ctx.debug(e.message)
-            ensure
-              syncer.shutdown
-            end
-          end
-        end
-
-        private
-
-        def generate_host_theme_name
-          hostname = Socket.gethostname.split(".").shift
-          hash = SecureRandom.hex(3)
-
-          theme_name = "App Ext. Host ()"
-          hostname_character_limit = API_NAME_LIMIT - theme_name.length - hash.length - 1
-          identifier = encode_identifier("#{hash}-#{hostname[0, hostname_character_limit]}")
-          theme_name = "App Ext. Host (#{identifier})"
-
-          ShopifyCLI::DB.set(host_theme_name: theme_name)
-
-          theme_name
-        end
-      end
-    end
-  end
-end

package/assets/cli-ruby/lib/shopify_cli/theme/extension/ignore_helper.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module ShopifyCLI
-  module Theme
-    module Extension
-      module IgnoreHelper
-        def ignore_operation?(operation)
-          path = operation.file_path
-          ignore_path?(path)
-        end
-
-        def ignore_file?(file)
-          path = file.relative_path
-          ignore_path?(path)
-        end
-
-        def ignore_path?(path)
-          is_ignored = ignored_by_ignore_filter?(path)
-
-          if is_ignored && @ctx
-            @ctx.debug("ignore #{path}")
-          end
-
-          is_ignored
-        end
-
-        private
-
-        def ignored_by_ignore_filter?(path)
-          ignore_filter&.ignore?(path)
-        end
-      end
-    end
-  end
-end