shopify-cli 2.11.0 → 2.12.0

data/lib/shopify_cli/theme/dev_server/proxy.rb

@@ -3,7 +3,6 @@ require "net/http"
 require "stringio"
 require "time"
 require "cgi"
-
 require_relative "proxy/template_param_builder"
 
 module ShopifyCLI
@@ -43,9 +42,8 @@ module ShopifyCLI
           headers["Accept-Encoding"] = "none"
           headers["User-Agent"] = "Shopify CLI"
 
-          query = URI.decode_www_form(env["QUERY_STRING"]).to_h
+          query = URI.decode_www_form(env["QUERY_STRING"])
           replace_templates = build_replace_templates_param(env)
-
           response = if replace_templates.any?
             # Pass to SFR the recently modified templates in `replace_templates` body param
             headers["Authorization"] = "Bearer #{bearer_token}"
@@ -71,13 +69,26 @@ module ShopifyCLI
             @core_endpoints << env["PATH_INFO"]
           end
 
-          body = response.body || [""]
+          body = patch_body(env, response.body)
           body = [body] unless body.respond_to?(:each)
           [response.code, headers, body]
         end
 
         private
 
+        def patch_body(env, body)
+          return [""] unless body
+
+          body.gsub(%r{(data-.+=(["']))(http:|https:)?//#{@theme.shop}(.*)(\2)}) do |_|
+            match = Regexp.last_match
+            "#{match[1]}http://#{host(env)}#{match[4]}#{match[5]}"
+          end
+        end
+
+        def host(env)
+          env["HTTP_HOST"]
+        end
+
         def has_body?(headers)
           headers["Content-Length"] || headers["Transfer-Encoding"]
         end
@@ -158,7 +169,7 @@ module ShopifyCLI
         def secure_session_id
           if secure_session_id_expired?
             @ctx.debug("Refreshing preview _secure_session_id cookie")
-            response = request("HEAD", "/", query: { preview_theme_id: @theme.id })
+            response = request("HEAD", "/", query: [[:preview_theme_id, @theme.id]])
             @secure_session_id = extract_secure_session_id_from_response_headers(response)
             @last_session_cookie_refresh = Time.now
           end
@@ -189,9 +200,9 @@ module ShopifyCLI
           response_headers
         end
 
-        def request(method, path, headers: nil, query: {}, form_data: nil, body_stream: nil)
+        def request(method, path, headers: nil, query: [], form_data: nil, body_stream: nil)
           uri = URI.join("https://#{@theme.shop}", path)
-          uri.query = URI.encode_www_form(query.merge(_fd: 0, pb: 0))
+          uri.query = URI.encode_www_form(query + [[:_fd, 0], [:pb, 0]])
 
           @ctx.debug("Proxying #{method} #{uri}")
 

data/lib/shopify_cli/theme/dev_server.rb

@@ -28,7 +28,7 @@ module ShopifyCLI
 
         def start(ctx, root, host: "127.0.0.1", port: 9292, poll: false, mode: ReloadMode.default)
           @ctx = ctx
-          theme = DevelopmentTheme.new(ctx, root: root)
+          theme = DevelopmentTheme.find_or_create!(ctx, root: root)
           ignore_filter = IgnoreFilter.from_path(root)
           @syncer = Syncer.new(ctx, theme: theme, ignore_filter: ignore_filter)
           watcher = Watcher.new(ctx, theme: theme, syncer: @syncer, ignore_filter: ignore_filter, poll: poll)
@@ -41,8 +41,6 @@ module ShopifyCLI
           stopped = false
           address = "http://#{host}:#{port}"
 
-          theme.ensure_exists!
-
           trap("INT") do
             stopped = true
             stop

data/lib/shopify_cli/theme/development_theme.rb

@@ -38,6 +38,8 @@ module ShopifyCLI
           @ctx.debug("Created temporary development theme: #{@id}")
           ShopifyCLI::DB.set(development_theme_id: @id)
         end
+
+        self
       end
 
       def exists?
@@ -63,6 +65,15 @@ module ShopifyCLI
         new(ctx).delete
       end
 
+      def self.find(ctx, root: nil)
+        dev_theme = new(ctx, root: root)
+        dev_theme.exists? ? dev_theme : nil
+      end
+
+      def self.find_or_create!(ctx, root: nil)
+        new(ctx, root: root).ensure_exists!
+      end
+
       private
 
       def generate_theme_name

data/lib/shopify_cli/theme/file.rb

@@ -53,6 +53,10 @@ module ShopifyCLI
         path.extname == ".liquid"
       end
 
+      def liquid_css?
+        relative_path.to_s.end_with?(".css.liquid")
+      end
+
       def json?
         path.extname == ".json"
       end

data/lib/shopify_cli/theme/include_filter.rb

@@ -9,7 +9,8 @@ module ShopifyCLI
 
       attr_reader :globs, :regexes
 
-      def initialize(patterns = [])
+      def initialize(root, patterns = [])
+        @root = Pathname.new(root)
         @patterns = patterns.nil? ? [] : patterns.compact.reject(&:empty?)
 
         regexes, globs = patterns_to_regexes_and_globs(@patterns)
@@ -22,9 +23,10 @@ module ShopifyCLI
         return true unless present?(@patterns)
 
         path = path.to_s
-
         return true if path.empty?
 
+        path = @root.join(path).to_s
+
         regexes.each do |regex|
           return true if regex_match?(regex, path)
         end

data/lib/shopify_cli/theme/syncer.rb

@@ -42,7 +42,7 @@ module ShopifyCLI
         # Latest theme assets checksums. Updated on each upload.
         @checksums = {}
 
-        # Checksums of assets with errors. 
+        # Checksums of assets with errors.
         @error_checksums = []
       end
 
@@ -168,7 +168,7 @@ module ShopifyCLI
           # Delete local files not present remotely
           missing_files = @theme.theme_files
             .reject { |file| checksums.key?(file.relative_path.to_s) }.uniq
-            .reject { |file| @ignore_filter&.ignore?(file) }
+            .reject { |file| ignore_file?(file) }
           missing_files.each do |file|
             @ctx.debug("rm #{file.relative_path}")
             file.delete
@@ -195,7 +195,7 @@ module ShopifyCLI
         # Already enqueued
         return if @pending.include?(operation)
 
-        if ignore?(operation)
+        if ignore_operation?(operation)
           @ctx.debug("ignore #{operation.file_path}")
           return
         end
@@ -253,8 +253,17 @@ module ShopifyCLI
         response
       end
 
-      def ignore?(operation)
+      def ignore_operation?(operation)
         path = operation.file_path
+        ignore_path?(path)
+      end
+
+      def ignore_file?(file)
+        path = file.path
+        ignore_path?(path)
+      end
+
+      def ignore_path?(path)
         ignored_by_ignore_filter?(path) || ignored_by_include_filter?(path)
       end
 

data/lib/shopify_cli/theme/theme.rb

@@ -176,10 +176,6 @@ module ShopifyCLI
           find(ctx, root) { |attrs| attrs["role"] == "main" }
         end
 
-        def development(ctx, root: nil)
-          find(ctx, root) { |attrs| attrs["role"] == "development" }
-        end
-
         # Finds a Theme by its identifier
         #
         # #### Parameters

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.11.0"
+  VERSION = "2.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -317,6 +317,7 @@ files:
 - lib/project_types/script/layers/infrastructure/languages/assemblyscript_task_runner.rb
 - lib/project_types/script/layers/infrastructure/languages/project_creator.rb
 - lib/project_types/script/layers/infrastructure/languages/task_runner.rb
+- lib/project_types/script/layers/infrastructure/languages/tool_version_checker.rb
 - lib/project_types/script/layers/infrastructure/languages/typescript_project_creator.rb
 - lib/project_types/script/layers/infrastructure/languages/typescript_task_runner.rb
 - lib/project_types/script/layers/infrastructure/languages/wasm_project_creator.rb
@@ -335,6 +336,7 @@ files:
 - lib/project_types/script/ui/strict_spinner.rb
 - lib/project_types/theme/cli.rb
 - lib/project_types/theme/commands/check.rb
+- lib/project_types/theme/commands/common/root_helper.rb
 - lib/project_types/theme/commands/delete.rb
 - lib/project_types/theme/commands/init.rb
 - lib/project_types/theme/commands/language_server.rb
@@ -343,6 +345,9 @@ files:
 - lib/project_types/theme/commands/pull.rb
 - lib/project_types/theme/commands/push.rb
 - lib/project_types/theme/commands/serve.rb
+- lib/project_types/theme/conversions/base_glob.rb
+- lib/project_types/theme/conversions/ignore_glob.rb
+- lib/project_types/theme/conversions/include_glob.rb
 - lib/project_types/theme/forms/confirm_store.rb
 - lib/project_types/theme/forms/select.rb
 - lib/project_types/theme/messages/messages.rb
@@ -459,6 +464,7 @@ files:
 - lib/shopify_cli/tasks/ensure_authenticated.rb
 - lib/shopify_cli/tasks/ensure_dev_store.rb
 - lib/shopify_cli/tasks/ensure_env.rb
+- lib/shopify_cli/tasks/ensure_git_dependency.rb
 - lib/shopify_cli/tasks/ensure_loopback_url.rb
 - lib/shopify_cli/tasks/ensure_project_type.rb
 - lib/shopify_cli/tasks/select_org_and_shop.rb
@@ -469,6 +475,7 @@ files:
 - lib/shopify_cli/theme/dev_server/header_hash.rb
 - lib/shopify_cli/theme/dev_server/hot-reload.js
 - lib/shopify_cli/theme/dev_server/hot_reload.rb
+- lib/shopify_cli/theme/dev_server/hot_reload/remote_file_reloader.rb
 - lib/shopify_cli/theme/dev_server/local_assets.rb
 - lib/shopify_cli/theme/dev_server/proxy.rb
 - lib/shopify_cli/theme/dev_server/proxy/template_param_builder.rb