shopify-cli 2.10.1 → 2.11.2

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "hot_reload/remote_file_reloader"
+
 module ShopifyCLI
   module Theme
     module DevServer
@@ -10,6 +12,7 @@ module ShopifyCLI
           @theme = theme
           @mode = mode
           @streams = SSE::Streams.new
+          @remote_file_reloader = RemoteFileReloader.new(ctx, theme: @theme, streams: @streams)
           @watcher = watcher
           @watcher.add_observer(self, :notify_streams_of_file_change)
           @ignore_filter = ignore_filter
@@ -32,17 +35,30 @@ module ShopifyCLI
         end
 
         def notify_streams_of_file_change(modified, added, _removed)
-          files = (modified + added).reject { |file| @ignore_filter&.ignore?(file) }
-            .map { |file| @theme[file].relative_path }
+          files = (modified + added)
+            .reject { |file| @ignore_filter&.ignore?(file) }
+            .map { |file| @theme[file] }
 
-          unless files.empty?
-            @streams.broadcast(JSON.generate(modified: files))
-            @ctx.debug("[HotReload] Modified #{files.join(", ")}")
-          end
+          files -= liquid_css_files = files.select(&:liquid_css?)
+
+          hot_reload(files) unless files.empty?
+          remote_reload(liquid_css_files)
         end
 
         private
 
+        def hot_reload(files)
+          paths = files.map(&:relative_path)
+          @streams.broadcast(JSON.generate(modified: paths))
+          @ctx.debug("[HotReload] Modified #{paths.join(", ")}")
+        end
+
+        def remote_reload(files)
+          files.each do |file|
+            @remote_file_reloader.reload(file)
+          end
+        end
+
         def request_is_html?(headers)
           headers["content-type"]&.start_with?("text/html")
         end

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

@@ -43,9 +43,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}"
@@ -158,7 +157,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 +188,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

@@ -7,36 +7,58 @@ module ShopifyCLI
     class IncludeFilter
       include Filter::PathMatcher
 
-      def initialize(pattern = nil)
-        @pattern = pattern
+      attr_reader :globs, :regexes
+
+      def initialize(patterns = [])
+        @patterns = patterns.nil? ? [] : patterns.compact.reject(&:empty?)
+
+        regexes, globs = patterns_to_regexes_and_globs(@patterns)
+
+        @regexes = regexes
+        @globs = globs
       end
 
       def match?(path)
-        return true unless present?(@pattern)
+        return true unless present?(@patterns)
+
+        path = path.to_s
+
+        return true if path.empty?
 
-        if regex_pattern?
-          regex_match?(regex_pattern, path)
-        else
-          glob_match?(glob_pattern, path)
+        regexes.each do |regex|
+          return true if regex_match?(regex, path)
         end
+
+        globs.each do |glob|
+          return true if glob_match?(glob, path)
+        end
+
+        false
       end
 
       private
 
-      def present?(pattern)
-        !pattern.nil? && !pattern.empty?
+      def present?(patterns)
+        !patterns.nil? && !patterns.empty?
       end
 
-      def regex_pattern?
-        @is_regex_pattern ||= regex?(@pattern)
-      end
+      # Take in string patterns and convert them to either
+      # regex patterns or glob patterns so that they are handled in an expected manner.
+      def patterns_to_regexes_and_globs(patterns)
+        new_regexes = []
+        new_globs = []
 
-      def regex_pattern
-        @regex_pattern ||= as_regex(@pattern)
-      end
+        patterns
+          .map(&:strip)
+          .each do |pattern|
+            if regex?(pattern)
+              new_regexes << as_regex(pattern)
+            else
+              new_globs << as_glob(pattern)
+            end
+          end
 
-      def glob_pattern
-        @glob_pattern ||= as_glob(@pattern)
+        [new_regexes, new_globs]
       end
     end
   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/utilities.rb

@@ -0,0 +1,7 @@
+module ShopifyCLI
+  module Utilities
+    def self.version_dropping_pre_and_build(version)
+      Semantic::Version.new("#{version.major}.#{version.minor}.#{version.patch}")
+    end
+  end
+end

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.10.1"
+  VERSION = "2.11.2"
 end

data/lib/shopify_cli.rb

@@ -136,6 +136,7 @@ module ShopifyCLI
   autoload :Tasks, "shopify_cli/tasks"
   autoload :TransformDataStructure, "shopify_cli/transform_data_structure"
   autoload :Tunnel, "shopify_cli/tunnel"
+  autoload :Utilities, "shopify_cli/utilities"
 
   require "shopify_cli/messages/messages"
   Context.load_messages(ShopifyCLI::Messages::MESSAGES)

data/vendor/deps/cli-kit/lib/cli/kit/system.rb

@@ -174,11 +174,16 @@ module CLI
         end
 
         def os
-          return :mac if /darwin/.match(RUBY_PLATFORM)
-          return :linux if /linux/.match(RUBY_PLATFORM)
-          return :windows if /mingw32/.match(RUBY_PLATFORM)
-
-          raise "Could not determine OS from platform #{RUBY_PLATFORM}"
+          @current_os ||= case RbConfig::CONFIG['host_os']
+          when /darwin/ then :mac
+          when /linux/ then :linux
+          else
+            if RUBY_PLATFORM !~ /cygwin/ && ENV['OS'] == 'Windows_NT'
+              :windows
+            else
+              raise "Could not determine OS from host_os #{RbConfig::CONFIG["host_os"]}"
+            end
+          end
         end
 
         private
@@ -222,7 +227,7 @@ module CLI
         end
 
         def which(cmd, env)
-          exts = os == :windows ? env.fetch('PATHEXT', ['']).split(';') : ['']
+          exts = (os == :windows && env['PATHEXT']&.split(';')) || ['']
           env.fetch('PATH', '').split(File::PATH_SEPARATOR).each do |path|
             exts.each do |ext|
               exe = File.join(path, "#{cmd}#{ext}")

data/vendor/deps/cli-kit/lib/cli/kit/util.rb

@@ -168,9 +168,13 @@ module CLI
           @block_that_might_raise = block_that_might_raise
         end
 
-        def retry_after(exception = StandardError, retries: 1, &before_retry)
+        def retry_after(exception = StandardError, retries: 1, only: nil, &before_retry)
           @block_that_might_raise.call
         rescue exception => e
+          should_retry = only ? only.call : true
+  
+          raise unless should_retry
+
           raise if (retries -= 1) < 0
           if before_retry
             if before_retry.arity == 0

data/vendor/deps/cli-ui/lib/cli/ui/os.rb

@@ -4,15 +4,17 @@ module CLI
       # Determines which OS is currently running the UI, to make it easier to
       # adapt its behaviour to the features of the OS.
       def self.current
-        @current_os ||= case RUBY_PLATFORM
+        @current_os ||= case RbConfig::CONFIG['host_os']
         when /darwin/
           Mac
         when /linux/
           Linux
-        when /mingw32/
-          Windows
         else
-          raise "Could not determine OS from platform #{RUBY_PLATFORM}"
+          if RUBY_PLATFORM !~ /cygwin/ && ENV['OS'] == 'Windows_NT'
+            Windows
+          else
+            raise "Could not determine OS from host_os #{RbConfig::CONFIG["host_os"]}"
+          end
         end
       end
 

data/vendor/lib/semantic/version.rb

@@ -21,7 +21,6 @@ module Semantic
       @version = version_str
     end
 
-
     def build=(b)
       @build = (!b.nil? && b.empty?) ? nil : b
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.11.2
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-28 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,6 +118,9 @@ files:
 - ".github/CONTRIBUTING.md"
 - ".github/DESIGN.md"
 - ".github/ISSUE_TEMPLATE.md"
+- ".github/ISSUE_TEMPLATE/bug_report.yaml"
+- ".github/ISSUE_TEMPLATE/enhancement.yaml"
+- ".github/ISSUE_TEMPLATE/feature.yaml"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/probots.yml"
 - ".github/workflows/shopify.yml"
@@ -273,7 +276,6 @@ files:
 - lib/project_types/php/forms/create.rb
 - lib/project_types/php/messages/messages.rb
 - lib/project_types/rails/cli.rb
-- lib/project_types/rails/commands/create.rb
 - lib/project_types/rails/forms/create.rb
 - lib/project_types/rails/gem.rb
 - lib/project_types/rails/messages/messages.rb
@@ -317,6 +319,9 @@ files:
 - lib/project_types/script/layers/infrastructure/languages/task_runner.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
+- lib/project_types/script/layers/infrastructure/languages/wasm_task_runner.rb
+- lib/project_types/script/layers/infrastructure/metadata_repository.rb
 - lib/project_types/script/layers/infrastructure/push_package_repository.rb
 - lib/project_types/script/layers/infrastructure/script_project_repository.rb
 - lib/project_types/script/layers/infrastructure/script_service.rb
@@ -402,6 +407,7 @@ files:
 - lib/shopify_cli/heroku.rb
 - lib/shopify_cli/http_request.rb
 - lib/shopify_cli/identity_auth.rb
+- lib/shopify_cli/identity_auth/env_auth_token.rb
 - lib/shopify_cli/identity_auth/servlet.rb
 - lib/shopify_cli/js_deps.rb
 - lib/shopify_cli/js_system.rb
@@ -463,6 +469,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
@@ -485,6 +492,7 @@ files:
 - lib/shopify_cli/thread_pool/job.rb
 - lib/shopify_cli/transform_data_structure.rb
 - lib/shopify_cli/tunnel.rb
+- lib/shopify_cli/utilities.rb
 - lib/shopify_cli/version.rb
 - shopify-cli.gemspec
 - shopify-dev

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

@@ -1,210 +0,0 @@
-# frozen_string_literal: true
-module Rails
-  class Command
-    class Create < ShopifyCLI::Command::AppSubCommand
-      prerequisite_task :ensure_authenticated
-
-      USER_AGENT_CODE = <<~USERAGENT
-        module ShopifyAPI
-          class Base < ActiveResource::Base
-            self.headers['User-Agent'] << " | ShopifyApp/\#{ShopifyApp::VERSION} | Shopify CLI"
-          end
-        end
-      USERAGENT
-
-      DEFAULT_RAILS_FLAGS = %w(--skip-spring)
-
-      options do |parser, flags|
-        # backwards compatibility allow 'title' for now
-        parser.on("--title=TITLE") { |t| flags[:title] = t }
-        parser.on("--name=NAME") { |t| flags[:title] = t }
-        parser.on("--organization_id=ID") { |id| flags[:organization_id] = id }
-        parser.on("--organization-id=ID") { |id| flags[:organization_id] = id }
-        parser.on("--store=MYSHOPIFYDOMAIN") { |url| flags[:shop_domain] = url }
-        # backwards compatibility allow 'shop domain' for now
-        parser.on("--shop_domain=MYSHOPIFYDOMAIN") { |url| flags[:shop_domain] = url }
-        parser.on("--shop-domain=MYSHOPIFYDOMAIN") { |url| flags[:shop_domain] = url }
-        parser.on("--type=APPTYPE") { |type| flags[:type] = type }
-        parser.on("--db=DB") { |db| flags[:db] = db }
-        parser.on("--rails_opts=RAILSOPTS") { |opts| flags[:rails_opts] = opts }
-        parser.on("--rails-opts=RAILSOPTS") { |opts| flags[:rails_opts] = opts }
-      end
-
-      def call(args, _name)
-        form_data = self.form_data(args)
-        return @ctx.puts(self.class.help) if form_data.nil?
-
-        ruby_version = Ruby.version(@ctx)
-        @ctx.abort(@ctx.message("rails.create.error.invalid_ruby_version")) unless
-          ruby_version.satisfies?("~>2.5") || ruby_version.satisfies?("~>3.0.0")
-
-        check_node
-        check_yarn
-
-        build(form_data.name, form_data.db)
-
-        set_custom_ua
-        ShopifyCLI::Project.write(
-          @ctx,
-          project_type: "rails",
-          organization_id: form_data.organization_id,
-        )
-
-        api_client = if ShopifyCLI::Environment.acceptance_test?
-          {
-            "apiKey" => "public_api_key",
-            "apiSecretKeys" => [
-              {
-                "secret" => "api_secret_key",
-              },
-            ],
-          }
-        else
-          ShopifyCLI::Tasks::CreateApiClient.call(
-            @ctx,
-            org_id: form_data.organization_id,
-            title: form_data.title,
-            type: form_data.type,
-          )
-        end
-
-        ShopifyCLI::Resources::EnvFile.new(
-          api_key: api_client["apiKey"],
-          secret: api_client["apiSecretKeys"].first["secret"],
-          shop: form_data.shop_domain,
-          scopes: "write_products,write_customers,write_draft_orders",
-        ).write(@ctx)
-
-        partners_url = ShopifyCLI::PartnersAPI.partners_url_for(form_data.organization_id, api_client["id"])
-
-        @ctx.puts(@ctx.message("apps.create.info.created", form_data.title, partners_url))
-        @ctx.puts(@ctx.message("apps.create.info.serve", form_data.name, ShopifyCLI::TOOL_NAME, "rails"))
-        unless ShopifyCLI::Shopifolk.acting_as_shopify_organization?
-          @ctx.puts(@ctx.message("apps.create.info.install", partners_url, form_data.title))
-        end
-      end
-
-      def form_data(args)
-        if ShopifyCLI::Environment.acceptance_test?
-          Struct.new(:title, :name, :organization_id, :type, :shop_domain, :db, keyword_init: true).new(
-            title: options.flags[:title],
-            name: options.flags[:title],
-            organization_id: "123",
-            shop_domain: "test.shopify.io",
-            type: "public",
-            db: options.flags[:db]
-          )
-        else
-          Forms::Create.ask(@ctx, args, options.flags)
-        end
-      end
-
-      def self.help
-        ShopifyCLI::Context.message("rails.create.help", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
-      end
-
-      private
-
-      def check_node
-        cmd_path = @ctx.which("node")
-        if cmd_path.nil?
-          @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
-        end
-
-        version, stat = @ctx.capture2e("node", "-v")
-        unless stat.success?
-          @ctx.abort(@ctx.message("rails.create.error.node_version_failure")) unless @ctx.windows?
-          # 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
-        end
-
-        @ctx.done(@ctx.message("rails.create.node_version", version))
-      end
-
-      def check_yarn
-        cmd_path = @ctx.which("yarn")
-        if cmd_path.nil?
-          @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
-        end
-
-        version, stat = @ctx.capture2e("yarn", "-v")
-        unless stat.success?
-          @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
-        end
-
-        @ctx.done(@ctx.message("rails.create.yarn_version", version))
-      end
-
-      def build(name, db)
-        @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")
-
-        full_path = File.join(@ctx.root, name)
-        @ctx.abort(@ctx.message("rails.create.error.dir_exists", name)) if Dir.exist?(full_path)
-
-        CLI::UI::Frame.open(@ctx.message("rails.create.generating_app", name)) do
-          new_command = %w(rails new)
-          new_command << name
-          new_command += DEFAULT_RAILS_FLAGS
-          new_command << "--database=#{db}"
-          new_command += options.flags[:rails_opts].split unless options.flags[:rails_opts].nil?
-
-          syscall(new_command)
-        end
-
-        @ctx.root = full_path
-
-        File.open(File.join(@ctx.root, ".gitignore"), "a") { |f| f.write(".env") }
-
-        @ctx.puts(@ctx.message("rails.create.adding_shopify_gem"))
-        File.open(File.join(@ctx.root, "Gemfile"), "a") do |f|
-          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
-          syscall(%w(rails generate shopify_app --new-shopify-cli-app))
-        end
-
-        CLI::UI::Frame.open(@ctx.message("rails.create.running_migrations")) do
-          syscall(%w(rails db:create))
-          syscall(%w(rails db:migrate RAILS_ENV=development))
-        end
-
-        unless File.exist?(File.join(@ctx.root, "config/webpacker.yml"))
-          CLI::UI::Frame.open(@ctx.message("rails.create.running_webpacker_install")) do
-            syscall(%w(rails webpacker:install))
-          end
-        end
-      end
-
-      def set_custom_ua
-        ua_path = File.join("config", "initializers", "user_agent.rb")
-        @ctx.write(ua_path, USER_AGENT_CODE)
-      end
-
-      def syscall(args)
-        args[0] = Gem.binary_path_for(@ctx, args[0])
-        @ctx.system(*args, chdir: @ctx.root)
-      end
-
-      def install_gem(name, version = nil)
-        Gem.install(@ctx, name, version)
-      end
-    end
-  end
-end